diff options
| author | PayBas <contact@paybas.com> | 2014-05-17 11:20:37 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 16:26:34 +0100 |
| commit | 6ccffec90695becd92d1144f6cbd9ef72f0d9b51 (patch) | |
| tree | d6438cb08200e8e2d001201c53e2ba8285894b9f /phpBB/includes/functions_display.php | |
| parent | ce35aa8b0b90870608a5b0782a36c6aedad8c7e4 (diff) | |
| download | forums-6ccffec90695becd92d1144f6cbd9ef72f0d9b51.tar forums-6ccffec90695becd92d1144f6cbd9ef72f0d9b51.tar.gz forums-6ccffec90695becd92d1144f6cbd9ef72f0d9b51.tar.bz2 forums-6ccffec90695becd92d1144f6cbd9ef72f0d9b51.tar.xz forums-6ccffec90695becd92d1144f6cbd9ef72f0d9b51.zip | |
[ticket/12559] Add forum setting to limit subforum legend
Squashed all commits, they were basically just typos and errors
PHPBB3-12559
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 1ac18fd3f8..1311148e8d 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'])) ? true : false; $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(); |