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

1 files changed, 4 insertions, 4 deletions

diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index 55e330cab..765998e0e 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -42,7 +42,7 @@
 	</tr>
 <?php
 	$members = array();
-	if ($friends = get_user_friends(get_loggedin_userid(), '', 9999, 0)) {
+	if ($friends = get_user_friends(elgg_get_logged_in_user_guid(), '', 9999, 0)) {
 		foreach($friends as $friend) {
 			$members[] = $friend->guid;
 		}
@@ -63,7 +63,7 @@
 	$i = 0;
 	foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 		$metaname = 'collections_notifications_preferences_' . $method;
-		if ($collections_preferences = get_loggedin_user()->$metaname) {
+		if ($collections_preferences = elgg_get_logged_in_user_entity()->$metaname) {
 			if (!empty($collections_preferences) && !is_array($collections_preferences)) {
 				$collections_preferences = array($collections_preferences);
 			}
@@ -95,7 +95,7 @@ END;
 	@todo
 	collections removed from notifications - they are no longer used and will be replaced with shared access collections
 	
-	if ($collections = get_user_access_collections(get_loggedin_userid())) {
+	if ($collections = get_user_access_collections(elgg_get_logged_in_user_guid())) {
 		foreach($collections as $collection) {
 			$members = get_members_of_access_collection($collection->id, true);
 			$memberno = sizeof($members);
@@ -115,7 +115,7 @@ END;
 			$i = 0;
 			foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 				$metaname = 'collections_notifications_preferences_' . $method;
-				if ($collections_preferences = get_loggedin_user()->$metaname) {
+				if ($collections_preferences = elgg_get_logged_in_user_entity()->$metaname) {
 					if (!empty($collections_preferences) && !is_array($collections_preferences)) {
 						$collections_preferences = array($collections_preferences);
 					}