diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-04-17 20:45:19 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-04-17 20:45:19 +0200 |
| commit | f905b40ce8bb03309fd87ad32ce424aefe76acd3 (patch) | |
| tree | 03f97f01e51fd178f01086c03f124f3576bf5beb /phpBB/phpbb/session.php | |
| parent | c8ff4b41096c31a67b7cf534bba78c442d285b73 (diff) | |
| parent | 562601fd9bb7ec7ba9dff9132840ed9b231a7f72 (diff) | |
| download | forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar.gz forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar.bz2 forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.tar.xz forums-f905b40ce8bb03309fd87ad32ce424aefe76acd3.zip | |
Merge pull request #5559 from mrgoldy/ticket/16007
[ticket/16007] Show ban message for OAuth login
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 80934dc411..31f32af7c4 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1299,7 +1299,12 @@ class session trigger_error($message); } - return ($banned && $ban_row['ban_give_reason']) ? $ban_row['ban_give_reason'] : $banned; + if (!empty($ban_row)) + { + $ban_row['ban_triggered_by'] = $ban_triggered_by; + } + + return ($banned && $ban_row) ? $ban_row : $banned; } /** |