mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-04-17 21:24:59 +02:00
parent 79b8b152a6 f905b40ce8
commit 61b199aefb
4 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/phpbb/session.php
View File

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