Skip to content

[3.0] Simplify the code a little by removing hide_subsections #6928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
live627 wants to merge 1 commit into
base: release-2.1
Choose a base branch
from
+3 −33
Open

[3.0] Simplify the code a little by removing hide_subsections #6928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions Sources/Subs-Menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,6 @@ function createMenu($menuData, $menuOptions = array())
// Let's assume this is the last, for now.
$last_sa = $sa;
}
// Mark it as disabled...
else
$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
}

// Set which one is first, last and selected in the group.
Expand Down Expand Up @@ -267,23 +264,6 @@ function createMenu($menuData, $menuOptions = array())
}
}

foreach ($menu_context['sections'] as $section_id => $section)
{
if (!empty($section['areas']))
{
foreach ($section['areas'] as $area_id => $area)
{
if (!empty($area['subsections']))
{
$menu_context['sections'][$section_id]['areas'][$area_id]['hide_subsections'] = true;

foreach ($area['subsections'] as $sa => $sub)
$menu_context['sections'][$section_id]['areas'][$area_id]['hide_subsections'] &= !empty($sub['disabled']);
}
}
}
}

// Should we use a custom base url, or use the default?
$menu_context['base_url'] = isset($menuOptions['base_url']) ? $menuOptions['base_url'] : $scripturl . '?action=' . $menu_context['current_action'];

Expand Down
16 changes: 3 additions & 13 deletions Themes/default/GenericMenu.template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,21 @@ function template_generic_menu(&$menu_context)
continue;

echo '
<li', !empty($area['subsections']) && empty($area['hide_subsections']) ? ' class="subsections"' : '', '>
<li', !empty($area['subsections']) ? ' class="subsections"' : '', '>
<a class="', $area['icon_class'], !empty($area['selected']) ? ' chosen ' : '', '" href="', (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i), $menu_context['extra_parameters'], '">', $area['icon'], $area['label'], !empty($area['amt']) ? ' <span class="amt">' . $area['amt'] . '</span>' : '', '</a>';

// Is this the current area, or just some area?
if (!empty($area['selected']) && empty($context['tabs']))
$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();

// Are there any subsections?
if (!empty($area['subsections']) && empty($area['hide_subsections']))
if (!empty($area['subsections']))
{
echo '
<ul>';

foreach ($area['subsections'] as $sa => $sub)
{
if (!empty($sub['disabled']))
continue;

$url = isset($sub['url']) ? $sub['url'] : (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa;

echo '
Expand Down Expand Up @@ -163,13 +160,6 @@ function template_generic_menu_tabs(&$menu_context)
{
foreach ($context['tabs'] as $id => $tab)
{
// Can this not be accessed?
if (!empty($tab['disabled']))
{
$tab_context['tabs'][$id]['disabled'] = true;
continue;
}

// Did this not even exist - or do we not have a label?
if (!isset($tab_context['tabs'][$id]))
$tab_context['tabs'][$id] = array('label' => $tab['label']);
Expand Down Expand Up @@ -251,7 +241,7 @@ function template_generic_menu_tabs(&$menu_context)

foreach ($tab_context['tabs'] as $sa => $tab)
{
if (!empty($tab['disabled']))
if (empty($tab['label']))
continue;

if (!empty($tab['is_selected']))
Expand Down