aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-10-19 13:55:48 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-10-19 13:55:48 +0000
commitfcd9b898f156b9b0269a2d2108b9d83660b791d0 (patch)
tree9a2b09047c79fa386619f5ecd63306fe2bdf7ef1 /phpBB/includes/functions_module.php
parent9a0ca3d334396940cc32ed153ccdfef76ece8d9e (diff)
downloadforums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.gz
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.bz2
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.tar.xz
forums-fcd9b898f156b9b0269a2d2108b9d83660b791d0.zip
Revised attachment categories a bit
Fixes for the following bugs: #4830 #4818 #4816 #4810 #4808 #4798 #4796 #4772 #4662 #4646 #4546 #4524 #4270 I hope not having introduced additional severe errors :) git-svn-id: file:///svn/phpbb/trunk@6511 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_module.php')
-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 5d5f004064..89dda74700 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -256,9 +256,9 @@ class p_master
// If no category or module selected, go active for first module in first category
if (
(($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && (($item_ary['mode'] == $mode && !$item_ary['cat']) || ($icat && $item_ary['cat']))) ||
- ($item_ary['parent'] === $category && !$item_ary['cat'] && !$icat) ||
+ ($item_ary['parent'] === $category && !$item_ary['cat'] && !$icat && $item_ary['display']) ||
(($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && !$mode && !$item_ary['cat']) ||
- (!$id && !$mode && !$item_ary['cat'])
+ (!$id && !$mode && !$item_ary['cat'] && $item_ary['display'])
)
{
if ($item_ary['cat'])