1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-04 07:53:06 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-03-01 18:58:28 +01:00
commit 0b8ecb4e22
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

@ -267,7 +267,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
// Direct child of current branch
$parent_id = $forum_id;
$parent_subforum_limit = $row['display_subforum_limit'];
$parent_subforum_limit = $row['display_subforum_limit'] ?? false;
$forum_rows[$forum_id] = $row;
if ($row['forum_type'] == FORUM_CAT && $row['parent_id'] == $root_data['forum_id'])