From 46094fb153ed8f7ab5d74c79bbc687955551e691 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 24 Feb 2011 02:49:04 +0000
Subject: fixing friends collections for backward compatibility

git-svn-id: http://code.elgg.org/elgg/trunk@8459 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/users.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engine/lib/users.php')

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 8a5289a03..1ac87e7d1 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1087,16 +1087,18 @@ function collections_submenu_items() {
 	$user = elgg_get_logged_in_user_entity();
 
 	elgg_register_menu_item('page', array(
-		'name' => 'friends:collections:view',
+		'name' => 'friends:view:collections',
 		'text' => elgg_echo('friends:collections'),
 		'href' => "pg/collections/$user->username",
 	));
-
+/*
 	elgg_register_menu_item('page', array(
 		'name' => 'friends:collections:add',
 		'text' => elgg_echo('friends:collections:add'),
 		'href' => "pg/collections/add",
 	));
+ * 
+ */
 }
 
 /**
@@ -1111,7 +1113,6 @@ function friends_page_handler($page_elements) {
 		set_page_owner($user->getGUID());
 	}
 	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-		// disabled for now as we no longer use friends collections (replaced by shared access)
 		collections_submenu_items();
 	}
 	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/index.php");
@@ -1130,7 +1131,6 @@ function friends_of_page_handler($page_elements) {
 		set_page_owner($user->getGUID());
 	}
 	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-		// disabled for now as we no longer use friends collections (replaced by shared access)
 		collections_submenu_items();
 	}
 	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/of.php");
@@ -1144,6 +1144,7 @@ function friends_of_page_handler($page_elements) {
  * @return void
  */
 function collections_page_handler($page_elements) {
+	elgg_set_context('friends');
 	if (isset($page_elements[0])) {
 		if ($page_elements[0] == "add") {
 			set_page_owner(elgg_get_logged_in_user_guid());
@@ -1474,7 +1475,7 @@ function users_pagesetup() {
 		elgg_register_menu_item('page', $params);
 
 		$params = array(
-			'name' => 'friendsof',
+			'name' => 'friends:of',
 			'text' => elgg_echo('friends:of'),
 			'href' => 'pg/friendsof/' . elgg_get_page_owner_entity()->username,
 			'contexts' => array('friends')
-- 
cgit v1.2.3