Merged r6701:6756 from 1.7 branch into trunk

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

4 files changed, 8 insertions, 8 deletions

diff --git a/actions/friends/add.php b/actions/friends/add.php
index 934424b57..345a86774 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -19,7 +19,7 @@ $errors = false;
 
 // Get the user
 try {
-	if (!$_SESSION['user']->addFriend($friend_guid)) {
+	if (!get_loggedin_user()->addFriend($friend_guid)) {
 		$errors = true;
 	}
 } catch (Exception $e) {
@@ -28,7 +28,7 @@ try {
 }
 if (!$errors){
 	// add to river
-	add_to_river('friends/river/create','friend',$_SESSION['user']->guid,$friend_guid);
+	add_to_river('friends/river/create','friend',get_loggedin_userid(),$friend_guid);
 	system_message(sprintf(elgg_echo("friends:add:successful"),$friend->name));
 }
 
diff --git a/actions/friends/addcollection.php b/actions/friends/addcollection.php
index e5541797b..6124b3496 100644
--- a/actions/friends/addcollection.php
+++ b/actions/friends/addcollection.php
@@ -21,7 +21,7 @@ $friends = get_input('friends_collection');
 if($collection_name){
 
 	//create the collection
-	$create_collection = create_access_collection($collection_name, $_SESSION['user']->getGUID());
+	$create_collection = create_access_collection($collection_name, get_loggedin_userid());
 
 	//if the collection was created and the user passed some friends from the form, add them
 	if($create_collection && (!empty($friends))){
@@ -34,7 +34,7 @@ if($collection_name){
 	// Success message
 	system_message(elgg_echo("friends:collectionadded"));
 	// Forward to the collections page
-	forward("pg/collections/" . $_SESSION['user']->username);
+	forward("pg/collections/" . get_loggedin_user()->username);
 
 } else {
 	register_error(elgg_echo("friends:nocollectionname"));
diff --git a/actions/friends/deletecollection.php b/actions/friends/deletecollection.php
index 1e18adcea..d4e077a24 100644
--- a/actions/friends/deletecollection.php
+++ b/actions/friends/deletecollection.php
@@ -20,9 +20,9 @@ $collection_id = (int) get_input('collection');
 // Check to see that the access collection exist and grab its owner
 $get_collection = get_access_collection($collection_id);
 
-if($get_collection){
+if ($get_collection) {
 
-	if($get_collection->owner_guid == $_SESSION['user']->getGUID()) {
+	if ($get_collection->owner_guid == get_loggedin_userid()) {
 
 		$delete_collection = delete_access_collection($collection_id);
 
@@ -42,4 +42,4 @@ if($get_collection){
 }
 
 // Forward to the collections page
-forward("pg/collections/" . $_SESSION['user']->username);
+forward("pg/collections/" . get_loggedin_user()->username);
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index 768291055..d3d362a92 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -19,7 +19,7 @@ $errors = false;
 // Get the user
 try{
 	if ($friend instanceof ElggUser) {
-		$_SESSION['user']->removeFriend($friend_guid);
+		get_loggedin_user()->removeFriend($friend_guid);
 	} else{
 		register_error(sprintf(elgg_echo("friends:remove:failure"), $friend->name));
 		$errors = true;