aboutsummaryrefslogtreecommitdiff
path: root/mod/notifications/views
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
commitccb6d625239b59b283b4d3fc00da704ab743d74c (patch)
treeda9b11d8758b3007c025e4d5487410ae1ca69f68 /mod/notifications/views
parent1368785a6b6f9c946dcc5eca078540bacce71f60 (diff)
downloadelgg-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/views')
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/collections.php8
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/forminternals.php4
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/groupsform.php2
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/personal.php2
4 files changed, 8 insertions, 8 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);
}
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index f0d391d0d..960b024db 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -11,11 +11,11 @@
<?php
// Get friends and subscriptions
-$friends = get_user_friends(get_loggedin_userid(),'',9999,0);
+$friends = get_user_friends(elgg_get_logged_in_user_guid(),'',9999,0);
global $NOTIFICATION_HANDLERS;
foreach($NOTIFICATION_HANDLERS as $method => $foo) {
- $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => get_loggedin_userid(), 'types' => 'user', 'limit' => 99999));
+ $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'user', 'limit' => 99999));
}
$subs = array();
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index b7b43cb66..632e34a54 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -7,7 +7,7 @@
global $NOTIFICATION_HANDLERS;
foreach($NOTIFICATION_HANDLERS as $method => $foo) {
- $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => get_loggedin_userid(), 'types' => 'group', 'limit' => 99999));
+ $subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 99999));
$tmparray = array();
if ($subsbig[$method]) {
foreach($subsbig[$method] as $tmpent) {
diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php
index ee8d948b9..e75bda758 100644
--- a/mod/notifications/views/default/notifications/subscriptions/personal.php
+++ b/mod/notifications/views/default/notifications/subscriptions/personal.php
@@ -40,7 +40,7 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
$fields = '';
$i = 0;
foreach($NOTIFICATION_HANDLERS as $method => $foo) {
- if ($notification_settings = get_user_notification_settings(get_loggedin_userid())) {
+ if ($notification_settings = get_user_notification_settings(elgg_get_logged_in_user_guid())) {
if ($notification_settings->$method) {
$personalchecked[$method] = 'checked="checked"';
} else {