1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

[ticket/16007] Show ban message for OAuth login

PHPBB3-16007
This commit is contained in:
mrgoldy
2019-04-02 15:12:52 +02:00
parent 433803287a
commit 68434e6dbc
3 changed files with 33 additions and 6 deletions

View File

@@ -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;
}
/**