diff options
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 1da00ac1af..31f32af7c4 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1234,8 +1234,6 @@ class session $vars = array('return', 'banned', 'ban_row', 'ban_triggered_by'); extract($phpbb_dispatcher->trigger_event('core.session_set_custom_ban', compact($vars))); - $ban_row['ban_triggered_by'] = $ban_triggered_by; - if ($banned && !$return) { global $phpbb_root_path, $phpEx; @@ -1301,6 +1299,11 @@ class session trigger_error($message); } + if (!empty($ban_row)) + { + $ban_row['ban_triggered_by'] = $ban_triggered_by; + } + return ($banned && $ban_row) ? $ban_row : $banned; } |