diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-06 12:02:15 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-06 12:02:15 +0200 |
| commit | e60b7f6cf23d15dc1cd0b92e37543bc6a2270901 (patch) | |
| tree | be3f213e4beae129df838e0107db5c41f8f56260 | |
| parent | 12c793bcd1b35321c1a8b4478de8c55f65e2dfed (diff) | |
| parent | 774582876cb00ff9858216aac74f74b1fb5ea818 (diff) | |
| download | forums-e60b7f6cf23d15dc1cd0b92e37543bc6a2270901.tar forums-e60b7f6cf23d15dc1cd0b92e37543bc6a2270901.tar.gz forums-e60b7f6cf23d15dc1cd0b92e37543bc6a2270901.tar.bz2 forums-e60b7f6cf23d15dc1cd0b92e37543bc6a2270901.tar.xz forums-e60b7f6cf23d15dc1cd0b92e37543bc6a2270901.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/includes/functions_display.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index f89068327c..2648938fc4 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -150,7 +150,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $sql = $db->sql_build_query('SELECT', $sql_ary); $result = $db->sql_query($sql); - $forum_tracking_info = array(); + $forum_tracking_info = $valid_categories = array(); $branch_root_id = $root_data['forum_id']; /* @var $phpbb_content_visibility \phpbb\content_visibility */ @@ -251,6 +251,12 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod } } + // Fill list of categories with forums + if (isset($forum_rows[$row['parent_id']])) + { + $valid_categories[$row['parent_id']] = true; + } + // if ($row['parent_id'] == $root_data['forum_id'] || $row['parent_id'] == $branch_root_id) { @@ -405,6 +411,12 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod // Category if ($row['parent_id'] == $root_data['forum_id'] && $row['forum_type'] == FORUM_CAT) { + // Do not display categories without any forums to display + if (!isset($valid_categories[$row['forum_id']])) + { + continue; + } + $cat_row = array( 'S_IS_CAT' => true, 'FORUM_ID' => $row['forum_id'], |