makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11581] Hide categories when they have no visible children

Browse source 
PHPBB3-11581
This commit is contained in:
Joas Schilling 2014-03-11 10:38:53 +01:00
parent cf468bcc09
commit eb1dd47e39
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/includes/functions_module.php
View file

@ -125,8 +125,17 @@ class p_master
// Clean up module cache array to only let survive modules the user can access // Clean up module cache array to only let survive modules the user can access
$right_id = false; $right_id = false;
$hide_categories = array();
foreach ($this->module_cache['modules'] as $key => $row) foreach ($this->module_cache['modules'] as $key => $row)
{ {
// When the module has no mode (category) we check whether it has visible children
// before listing it as well.
if (!$row['module_mode'])
{
$hide_categories[(int) $row['module_id']] = $key;
}
// Not allowed to view module? // Not allowed to view module?
if (!$this->module_auth_self($row['module_auth'])) if (!$this->module_auth_self($row['module_auth']))
{ {
@ -161,6 +170,22 @@ class p_master
$right_id = $row['right_id']; $right_id = $row['right_id'];
continue; continue;
} }
if ($row['module_mode'])
{
// The parent category has a visible child
// So remove it and all its parents from the hide array
unset($hide_categories[(int) $row['parent_id']]);
foreach ($this->module_cache['parents'][$row['module_id']] as $module_id => $row_id)
{
unset($hide_categories[$module_id]);
}
}
}
foreach ($hide_categories as $module_id => $row_id)
{
unset($this->module_cache['modules'][$row_id]);
} }
// Re-index (this is needed, else we are not able to array_slice later) // Re-index (this is needed, else we are not able to array_slice later)