aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-06 10:36:07 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-06 10:36:07 +0000
commitf8440e370fa789723a742b5b62d737e4fc71dcc7 (patch)
tree753c648625b9dd5c0e4cfe017d5195e452af3bb2 /phpBB/includes
parentd404c7055267deec7ecb07a6b80f98f07c0325e6 (diff)
downloadforums-f8440e370fa789723a742b5b62d737e4fc71dcc7.tar
forums-f8440e370fa789723a742b5b62d737e4fc71dcc7.tar.gz
forums-f8440e370fa789723a742b5b62d737e4fc71dcc7.tar.bz2
forums-f8440e370fa789723a742b5b62d737e4fc71dcc7.tar.xz
forums-f8440e370fa789723a742b5b62d737e4fc71dcc7.zip
correctly hide categories with only hidden modules
git-svn-id: file:///svn/phpbb/trunk@6011 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_module.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index cc8b093d4b..a684a513d3 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -154,8 +154,8 @@ class p_master
{
if ($temp_row['left_id'] > $row['left_id'] && $temp_row['left_id'] < $row['right_id'])
{
- // Module there
- if ($temp_row['module_name'] && $temp_row['module_enabled'])
+ // Module there and not hidden?
+ if ($temp_row['module_name'] && $temp_row['module_enabled'] && $temp_row['module_display'])
{
$empty_category = false;
break;