diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-08 20:46:21 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-08 20:46:21 +0100 |
| commit | 79a6648b99bc570dd9705547a35e21df808a6657 (patch) | |
| tree | 0e6181e834d1f51d3abcc06abbb2342db246c8f9 /phpBB/includes/functions_display.php | |
| parent | 8dbda26623ba86c5de9cc45303dbfd0c8170bb97 (diff) | |
| parent | 85837d48b20c63f86050d0125942b25928deb1a5 (diff) | |
| download | forums-79a6648b99bc570dd9705547a35e21df808a6657.tar forums-79a6648b99bc570dd9705547a35e21df808a6657.tar.gz forums-79a6648b99bc570dd9705547a35e21df808a6657.tar.bz2 forums-79a6648b99bc570dd9705547a35e21df808a6657.tar.xz forums-79a6648b99bc570dd9705547a35e21df808a6657.zip | |
Merge pull request #5726 from marc1706/ticket/12559
[ticket/12559] Add forum setting to limit subforum legend
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 9be1ff950b..44478dbe49 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -30,6 +30,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array(); $parent_id = $visible_forums = 0; + $parent_subforum_limit = false; // Mark forums read? $mark_read = $request->variable('mark', ''); @@ -266,6 +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']; $forum_rows[$forum_id] = $row; if ($row['forum_type'] == FORUM_CAT && $row['parent_id'] == $root_data['forum_id']) @@ -278,7 +280,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod } else if ($row['forum_type'] != FORUM_CAT) { - $subforums[$parent_id][$forum_id]['display'] = ($row['display_on_index']) ? true : false; + $subforums[$parent_id][$forum_id]['display'] = ($row['display_on_index'] && (!$parent_subforum_limit || $parent_id == $row['parent_id'])); $subforums[$parent_id][$forum_id]['name'] = $row['forum_name']; $subforums[$parent_id][$forum_id]['orig_forum_last_post_time'] = $row['forum_last_post_time']; $subforums[$parent_id][$forum_id]['children'] = array(); |