Fixes #2997 - href used instead of url in menu system

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

6 files changed, 17 insertions, 17 deletions

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 3f4a331de..1c78ce210 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -137,7 +137,7 @@ function elgg_add_admin_menu_item($section_id, $section_title, $parent_id = NULL
 
 	return elgg_register_menu_item('page', array(
 		'name' => $name,
-		'url' => $href,
+		'href' => $href,
 		'text' => $section_title,
 		'context' => 'admin',
 		'parent_name' => $parent_id,
@@ -204,7 +204,7 @@ function admin_init() {
 	// dashboard
 	elgg_register_menu_item('page', array(
 		'name' => 'dashboard',
-		'url' => 'pg/admin/dashboard',
+		'href' => 'pg/admin/dashboard',
 		'text' => elgg_echo('admin:dashboard'),
 		'context' => 'admin',
 		'weight' => 10,
diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index e31a9f8ba..8aaf003dc 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -1205,7 +1205,7 @@ function add_submenu_item($label, $link, $group = 'default', $onclick = false, $
 		$context = 'all';
 	}
 
-	$item = array('name' => $label, 'text' => $label, 'url' => $link, 'context' => $context,
+	$item = array('name' => $label, 'text' => $label, 'href' => $link, 'context' => $context,
 		'section' => $group,);
 
 	if ($selected) {
@@ -1251,7 +1251,7 @@ function add_menu($menu_name, $menu_url, $menu_children = array(), $context = ""
 	elgg_deprecated_notice('add_menu() deprecated by elgg_register_menu_item()', 1.8);
 
 	return elgg_register_menu_item('site', array('name' => $menu_name, 'text' => $menu_name,
-		'url' => $menu_url,));
+		'href' => $menu_url,));
 }
 
 /**
diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 1d3098938..5e03641a1 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -14,11 +14,11 @@
  *                          userprofile, groupprofile, or any custom menu
  * @param mixed  $menu_item A ElggMenuItem object or an array of options in format:
  *                          name        => STR  Menu item identifier (required)
- *                          title       => STR  Menu item title (required)
- *                          url         => STR  Menu item URL (required)
+ *                          text        => STR  Menu item display text (required)
+ *                          href        => STR  Menu item URL (required)
  *                          contexts    => ARR  Page context strings
  *                          section     => STR  Menu section identifier
- *                          tooltip     => STR  Menu item tooltip
+ *                          title       => STR  Menu item tooltip
  *                          selected    => BOOL Is this menu item currently selected
  *                          parent_name => STR  Identifier of the parent menu item
  *
diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index 25aa36dbd..f3e586851 100644
--- a/engine/lib/user_settings.php
+++ b/engine/lib/user_settings.php
@@ -254,19 +254,19 @@ function usersettings_pagesetup() {
 		$params = array(
 			'name' => '1_account',
 			'text' => elgg_echo('usersettings:user:opt:linktext'),
-			'url' => "pg/settings/user/{$user->username}",
+			'href' => "pg/settings/user/{$user->username}",
 		);
 		elgg_register_menu_item('page', $params);
 		$params = array(
 			'name' => '1_plugins',
 			'text' => elgg_echo('usersettings:plugins:opt:linktext'),
-			'url' => "pg/settings/plugins/{$user->username}",
+			'href' => "pg/settings/plugins/{$user->username}",
 		);
 		elgg_register_menu_item('page', $params);
 		$params = array(
 			'name' => '1_statistics',
 			'text' => elgg_echo('usersettings:statistics:opt:linktext'),
-			'url' => "pg/settings/statistics/{$user->username}",
+			'href' => "pg/settings/statistics/{$user->username}",
 		);
 		elgg_register_menu_item('page', $params);
 	}
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 9d1cb1ff6..8a5289a03 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1089,13 +1089,13 @@ function collections_submenu_items() {
 	elgg_register_menu_item('page', array(
 		'name' => 'friends:collections:view',
 		'text' => elgg_echo('friends:collections'),
-		'url' => "pg/collections/$user->username",
+		'href' => "pg/collections/$user->username",
 	));
 
 	elgg_register_menu_item('page', array(
 		'name' => 'friends:collections:add',
 		'text' => elgg_echo('friends:collections:add'),
-		'url' => "pg/collections/add",
+		'href' => "pg/collections/add",
 	));
 }
 
@@ -1468,7 +1468,7 @@ function users_pagesetup() {
 		$params = array(
 			'name' => 'friends',
 			'text' => elgg_echo('friends'),
-			'url' => 'pg/friends/' . elgg_get_page_owner_entity()->username,
+			'href' => 'pg/friends/' . elgg_get_page_owner_entity()->username,
 			'contexts' => array('friends')
 		);
 		elgg_register_menu_item('page', $params);
@@ -1476,7 +1476,7 @@ function users_pagesetup() {
 		$params = array(
 			'name' => 'friendsof',
 			'text' => elgg_echo('friends:of'),
-			'url' => 'pg/friendsof/' . elgg_get_page_owner_entity()->username,
+			'href' => 'pg/friendsof/' . elgg_get_page_owner_entity()->username,
 			'contexts' => array('friends')
 		);
 		elgg_register_menu_item('page', $params);
@@ -1509,14 +1509,14 @@ function users_init() {
 	if ($user) {
 		$params = array(
 			'name' => 'edit_avatar',
-			'url' => "pg/avatar/edit/{$user->username}",
+			'href' => "pg/avatar/edit/{$user->username}",
 			'text' => elgg_echo('avatar:edit'),
 			'contexts' => array('profile_edit'),
 		);
 		elgg_register_menu_item('page', $params);
 		$params = array(
 			'name' => 'edit_profile',
-			'url' => "pg/profile/{$user->username}/edit",
+			'href' => "pg/profile/{$user->username}/edit",
 			'text' => elgg_echo('profile:edit'),
 			'contexts' => array('profile_edit'),
 		);
diff --git a/engine/lib/views.php b/engine/lib/views.php
index db510a275..1ae89bac2 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -681,7 +681,7 @@ function elgg_view_menu($menu_name, array $vars = array()) {
 
 	$vars['name'] = $menu_name;
 
-	$sort_by = elgg_extract('sort_by', $vars, 'title');
+	$sort_by = elgg_extract('sort_by', $vars, 'text');
 
 	$menu = $CONFIG->menus[$menu_name];