diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-06-28 22:14:17 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-06-28 22:14:17 -0400 |
| commit | f816280293120801c08854282cc4af8774a78f4a (patch) | |
| tree | c77a62436259306ed91202994f49cfa4ad472fec | |
| parent | 6018b2f2f94feed66ae5fcb3ee68005d5e685652 (diff) | |
| parent | 60792fc2e420cf39a61d343c9252b73cabfecf78 (diff) | |
| download | elgg-f816280293120801c08854282cc4af8774a78f4a.tar.gz elgg-f816280293120801c08854282cc4af8774a78f4a.tar.bz2 | |
Merge pull request #283 from beck24/acl-notifications
Fixes #4580 - Friend Collections can again be used for notifications
| -rw-r--r-- | mod/notifications/languages/en.php | 2 | ||||
| -rw-r--r-- | mod/notifications/views/default/notifications/subscriptions/collections.php | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mod/notifications/languages/en.php b/mod/notifications/languages/en.php index b29c9df25..0f2ba2304 100644 --- a/mod/notifications/languages/en.php +++ b/mod/notifications/languages/en.php @@ -8,7 +8,7 @@ $english = array( 'notifications:subscriptions:personal:title' => 'Personal notifications', 'notifications:subscriptions:friends:title' => 'Friends', - 'notifications:subscriptions:friends:description' => 'The following is an automatic collection made up of your friends. To receive updates select below. This will affect the corresponding users in the main notification settings panel at the bottom of the page. ', + 'notifications:subscriptions:friends:description' => 'Below are collections of your friends. Selecting a collection turns on notifications for the users in that collection.', 'notifications:subscriptions:collections:edit' => 'To edit your shared access notifications, click here.', 'notifications:subscriptions:changesettings' => 'Notifications', diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php index b8787570d..8ce77c4b2 100644 --- a/mod/notifications/views/default/notifications/subscriptions/collections.php +++ b/mod/notifications/views/default/notifications/subscriptions/collections.php @@ -99,14 +99,14 @@ END; <td> </td> </tr> <?php -/* - @todo - collections removed from notifications - they are no longer used and will be replaced with shared access collections - - if ($collections = get_user_access_collections(elgg_get_logged_in_user_guid())) { + + if ($collections = get_user_access_collections($user->guid)) { foreach($collections as $collection) { $members = get_members_of_access_collection($collection->id, true); - $memberno = sizeof($members); + $memberno = 0; + if ($members) { + $memberno = sizeof($members); + } $members = implode(',', $members); ?> @@ -123,7 +123,7 @@ END; $i = 0; foreach($NOTIFICATION_HANDLERS as $method => $foo) { $metaname = 'collections_notifications_preferences_' . $method; - if ($collections_preferences = elgg_get_logged_in_user_entity()->$metaname) { + if ($collections_preferences = $user->$metaname) { if (!empty($collections_preferences) && !is_array($collections_preferences)) { $collections_preferences = array($collections_preferences); } @@ -156,7 +156,6 @@ END; } } -*/ ?> </table> </div> |