Refs #2543: Updated trunk mods and views to use the new functions from previous 2 commits.

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

4 files changed, 7 insertions, 7 deletions

diff --git a/actions/friends/add.php b/actions/friends/add.php
index e6fa5b62e..53e4971d4 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -14,7 +14,7 @@ $errors = false;
 
 // Get the user
 try {
-	if (!get_loggedin_user()->addFriend($friend_guid)) {
+	if (!elgg_get_logged_in_user_entity()->addFriend($friend_guid)) {
 		$errors = true;
 	}
 } catch (Exception $e) {
@@ -23,7 +23,7 @@ try {
 }
 if (!$errors) {
 	// add to river
-	add_to_river('friends/river/create', 'friend', get_loggedin_userid(), $friend_guid);
+	add_to_river('friends/river/create', 'friend', elgg_get_logged_in_user_guid(), $friend_guid);
 	system_message(elgg_echo("friends:add:successful", array($friend->name)));
 }
 
diff --git a/actions/friends/addcollection.php b/actions/friends/addcollection.php
index 92c78a2c1..eac8bced8 100644
--- a/actions/friends/addcollection.php
+++ b/actions/friends/addcollection.php
@@ -13,7 +13,7 @@ $friends = get_input('friends_collection');
 if ($collection_name) {
 
 	//create the collection
-	$create_collection = create_access_collection($collection_name, get_loggedin_userid());
+	$create_collection = create_access_collection($collection_name, elgg_get_logged_in_user_guid());
 
 	//if the collection was created and the user passed some friends from the form, add them
 	if ($create_collection && (!empty($friends))) {
@@ -26,7 +26,7 @@ if ($collection_name) {
 	// Success message
 	system_message(elgg_echo("friends:collectionadded"));
 	// Forward to the collections page
-	forward("pg/collections/" . get_loggedin_user()->username);
+	forward("pg/collections/" . elgg_get_logged_in_user_entity()->username);
 
 } else {
 	register_error(elgg_echo("friends:nocollectionname"));
diff --git a/actions/friends/deletecollection.php b/actions/friends/deletecollection.php
index 1c3d878a1..f0ceaf023 100644
--- a/actions/friends/deletecollection.php
+++ b/actions/friends/deletecollection.php
@@ -13,7 +13,7 @@ $get_collection = get_access_collection($collection_id);
 
 if ($get_collection) {
 
-	if ($get_collection->owner_guid == get_loggedin_userid()) {
+	if ($get_collection->owner_guid == elgg_get_logged_in_user_guid()) {
 
 		$delete_collection = delete_access_collection($collection_id);
 
@@ -33,4 +33,4 @@ if ($get_collection) {
 }
 
 // Forward to the collections page
-forward("pg/collections/" . get_loggedin_user()->username);
+forward("pg/collections/" . elgg_get_logged_in_user_entity()->username);
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index 0a43c95bc..d69d18f31 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -14,7 +14,7 @@ $errors = false;
 // Get the user
 try{
 	if ($friend instanceof ElggUser) {
-		get_loggedin_user()->removeFriend($friend_guid);
+		elgg_get_logged_in_user_entity()->removeFriend($friend_guid);
 	} else {
 		register_error(elgg_echo("friends:remove:failure", array($friend->name)));
 		$errors = true;