diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 19:52:10 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 19:52:10 +0000 |
commit | ccb6d625239b59b283b4d3fc00da704ab743d74c (patch) | |
tree | da9b11d8758b3007c025e4d5487410ae1ca69f68 /mod/notifications/actions | |
parent | 1368785a6b6f9c946dcc5eca078540bacce71f60 (diff) | |
download | elgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.gz elgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.bz2 |
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
Diffstat (limited to 'mod/notifications/actions')
-rw-r--r-- | mod/notifications/actions/groupsave.php | 6 | ||||
-rw-r--r-- | mod/notifications/actions/save.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mod/notifications/actions/groupsave.php b/mod/notifications/actions/groupsave.php index f39beb665..c304cb856 100644 --- a/mod/notifications/actions/groupsave.php +++ b/mod/notifications/actions/groupsave.php @@ -11,7 +11,7 @@ global $NOTIFICATION_HANDLERS; // Get group memberships and condense them down to an array of guids $groups = array(); -if ($groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => get_loggedin_userid(), 'types' => 'group', 'limit' => 9999))) { +if ($groupmemberships = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 9999))) { foreach($groupmemberships as $groupmembership) { $groups[] = $groupmembership->guid; } @@ -24,9 +24,9 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) { if (!empty($groups)) { foreach($groups as $group) { if (in_array($group,$subscriptions[$method])) { - add_entity_relationship(get_loggedin_userid(), 'notify'.$method, $group); + add_entity_relationship(elgg_get_logged_in_user_guid(), 'notify'.$method, $group); } else { - remove_entity_relationship(get_loggedin_userid(), 'notify'.$method, $group); + remove_entity_relationship(elgg_get_logged_in_user_guid(), 'notify'.$method, $group); } } } diff --git a/mod/notifications/actions/save.php b/mod/notifications/actions/save.php index eddda9dc6..163b656aa 100644 --- a/mod/notifications/actions/save.php +++ b/mod/notifications/actions/save.php @@ -6,7 +6,7 @@ * @package ElggNotifications */ -$user = get_loggedin_user(); +$user = elgg_get_logged_in_user_entity(); global $NOTIFICATION_HANDLERS; foreach($NOTIFICATION_HANDLERS as $method => $foo) { |