diff options
| author | czaks <marcin@6irc.net> | 2016-05-05 10:54:09 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2016-05-05 10:54:09 +0200 |
| commit | d310abc95c80a35f6cb4f8e5119e1d46bdb09b14 (patch) | |
| tree | 6b77311856bf1dd7387377d99977d23c30a955c0 /inc | |
| parent | 186ad5ca86ae2255bbe0d6846a390963d63ae9e9 (diff) | |
| parent | 19b70663d7e786fca0425b53eb79412fd5987255 (diff) | |
Merge branch 'master' of github.com:vichan-devel/vichan
Diffstat (limited to 'inc')
| -rwxr-xr-x | inc/functions.php | 2 | ||||
| -rw-r--r-- | inc/mod/pages.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/functions.php b/inc/functions.php index 462bc173..c50336ae 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -880,7 +880,7 @@ function displayBan($ban) { Element('page.html', array( 'title' => _('Banned!'), 'config' => $config, - 'nojavascript' => true, + 'boardlist' => createBoardlist($mod), 'body' => Element('banned.html', array( 'config' => $config, 'ban' => $ban, diff --git a/inc/mod/pages.php b/inc/mod/pages.php index 8b6f73c4..8380cfd3 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -15,7 +15,7 @@ function mod_page($title, $template, $args, $subtitle = false) { 'hide_dashboard_link' => $template == 'mod/dashboard.html', 'title' => $title, 'subtitle' => $subtitle, - 'nojavascript' => true, + 'boardlist' => createBoardlist($mod), 'body' => Element($template, array_merge( array('config' => $config, 'mod' => $mod), @@ -846,7 +846,7 @@ function mod_page_ip($ip) { $args['security_token'] = make_secure_link_token('IP/' . $ip); - mod_page(sprintf('%s: %s', _('IP'), $ip), 'mod/view_ip.html', $args, $args['hostname']); + mod_page(sprintf('%s: %s', _('IP'), htmlspecialchars($ip)), 'mod/view_ip.html', $args, $args['hostname']); } function mod_ban() { |