diff options
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index ae7e2d47f7..53218402c3 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -69,7 +69,6 @@ class p_master $sql = 'SELECT * FROM ' . MODULES_TABLE . " WHERE module_class = '" . $db->sql_escape($p_class) . "' - AND module_enabled = 1 ORDER BY left_id ASC"; $result = $db->sql_query($sql); @@ -101,7 +100,7 @@ class p_master } $right = $depth = $i = 0; - $depth_ary = array(); + $depth_ary = $disable = array(); foreach ($this->module_cache['modules'] as $row) { @@ -126,6 +125,30 @@ class p_master continue; } + // Not enabled? + if (!$row['module_enabled']) + { + // If category is disabled then disable every child too + if (!$row['module_name']) + { + $disable['left_id'] = $row['left_id']; + $disable['right_id'] = $row['right_id']; + } + + continue; + } + + if (sizeof($disable)) + { + if ($row['left_id'] > $disable['left_id'] && $row['left_id'] < $disable['right_id'] && + $row['right_id'] > $disable['left_id'] && $row['right_id'] < $disable['right_id']) + { + continue; + } + + $disable = array(); + } + if ($row['left_id'] < $right) { $depth++; |