diff options
| author | czaks <marcin@6irc.net> | 2013-09-18 09:00:22 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-09-18 09:00:22 -0400 |
| commit | 99a2e1cf3ddf3e7b3be8f65029297dce6955509c (patch) | |
| tree | 9001d26a78bb7e7f0156633b45b17c96a95c9bbb /inc | |
| parent | 8ca495e5b8c8382dbfeebc4990f0accc80101a46 (diff) | |
| parent | 8a5d6b1d3f2d9ce8177c240f78b9b1801bc7306c (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
js/quick-reply.js
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/bans.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/bans.php b/inc/bans.php index cf24f097..d860c02c 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -253,7 +253,7 @@ class Bans { modLog('Created a new ' . ($length > 0 ? preg_replace('/^(\d+) (\w+?)s?$/', '$1-$2', until($length)) : 'permanent') . ' ban on ' . - ($board ? '/' . $board . '/' : 'all boards') . + ($ban_board ? '/' . $ban_board . '/' : 'all boards') . ' for ' . (filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$mask\">$mask</a>" : $mask) . ' (<small>#' . $pdo->lastInsertId() . '</small>)' . |