Fix admin area for overview and appearance.

git-svn-id: http://code.elgg.org/elgg/trunk@5997 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 81ef69bafe620e5871edcf13e9d89df4173ea6b2..6a64bc19a641160e8c181f7600cb66cb54156a3c 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -88,6 +88,9 @@ function elgg_add_admin_submenu_item($section_id, $section_title, $parent_id = N
        // in the admin section parents never have links
        if ($parent_id) {
                $href = "{$CONFIG->url}pg/admin/$parent_id/$section_id";
+       } elseif ($section_id == 'overview') {
+               $href = "{$CONFIG->url}pg/admin/$section_id";
+
        } else {
                $href = NULL;
        }
@@ -122,12 +125,14 @@ function admin_init() {
 
        // admin area overview and basic site settings
        elgg_add_admin_submenu_item('overview', elgg_echo('admin:overview'));
+
        elgg_add_admin_submenu_item('site', elgg_echo('admin:site'));
-       elgg_add_admin_submenu_item('basic', elgg_echo('admin:site:basic'), 'admin:overview:site');
-       elgg_add_admin_submenu_item('advanced', elgg_echo('admin:site:advanced'), 'admin:overview:site');
+       elgg_add_admin_submenu_item('basic', elgg_echo('admin:site:basic'), 'site');
+       elgg_add_admin_submenu_item('advanced', elgg_echo('admin:site:advanced'), 'site');
 
        // appearance
        elgg_add_admin_submenu_item('appearance', elgg_echo('admin:appearance'));
+
        //elgg_add_admin_submenu_item('basic', elgg_echo('admin:appearance'), 'appearance');
        elgg_add_admin_submenu_item('menu_items', elgg_echo('admin:menu_items'), 'appearance');
 

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 8d41de1cc030cf4cb937e0f6043f8e108b8251cb..9ee85c559d549d0da32786dce60c10034babd9d4 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1139,7 +1139,7 @@ function elgg_get_submenu($context = NULL, $sort = FALSE) {
                while ($item = current($items)) {
                        $t = '';
                        // ignore parents created by a child but parent never defined properly
-                       if (!isset($item->text) || !isset($item->href) || !($item->text) || !($item->href)) {
+                       if (!isset($item->text) || !($item->text)) {
                                next($items);
                                continue;
                        }

diff --git a/views/default/navigation/submenu_item.php b/views/default/navigation/submenu_item.php
index ff2cc48d1b9e1aa86d96277edf3f2f69fe3ad361..0e3c485ef006c9cf798218e80157e2d0aace5de3 100644 (file)
--- a/views/default/navigation/submenu_item.php
+++ b/views/default/navigation/submenu_item.php
@@ -15,7 +15,6 @@ $group = (isset($vars['group'])) ? $vars['group'] : 'default';
 $item = (isset($vars['item'])) ? $vars['item'] : FALSE;
 $children_html = (isset($vars['children_html'])) ? $vars['children_html'] : '';
 
-
 if ($item) {
        $has_children = (isset($item->children) && $item->children) ? TRUE : FALSE;
        $selected = (isset($item->selected) && $item->selected == TRUE) ? 'class="selected"' : '';