From 239691e4507756985f6d54c002df7d8772e790c4 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 11 May 2010 02:15:22 +0000
Subject: Fix admin area for overview and appearance.

git-svn-id: http://code.elgg.org/elgg/trunk@5997 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/admin.php                      | 9 +++++++--
 engine/lib/elgglib.php                    | 2 +-
 views/default/navigation/submenu_item.php | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 81ef69baf..6a64bc19a 100644
--- 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 8d41de1cc..9ee85c559 100644
--- 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 ff2cc48d1..0e3c485ef 100644
--- 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"' : '';
-- 
cgit v1.2.3