diff options
| author | mrgoldy <gijsmartens1@gmail.com> | 2019-04-02 15:12:52 +0200 |
|---|---|---|
| committer | mrgoldy <gijsmartens1@gmail.com> | 2019-04-02 15:12:52 +0200 |
| commit | 68434e6dbc1b87f2bacb246b463d86ebc157473f (patch) | |
| tree | b6abce4147fcb24f2f5818bdaba11dcf491817ed /phpBB/phpbb/session.php | |
| parent | 433803287ad3eccece6fd5f358fa8dab10516bc6 (diff) | |
| download | forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar.gz forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar.bz2 forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.tar.xz forums-68434e6dbc1b87f2bacb246b463d86ebc157473f.zip | |
[ticket/16007] Show ban message for OAuth login
PHPBB3-16007
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 80934dc411..1da00ac1af 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1234,6 +1234,8 @@ 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; @@ -1299,7 +1301,7 @@ class session trigger_error($message); } - return ($banned && $ban_row['ban_give_reason']) ? $ban_row['ban_give_reason'] : $banned; + return ($banned && $ban_row) ? $ban_row : $banned; } /** |