From cc8127e2191011698a7c0cf13882fedcd88678cc Mon Sep 17 00:00:00 2001
From: Matt Beckett <beck24@gmail.com>
Date: Wed, 27 Jun 2012 13:06:00 -0600
Subject: Uncommented friend collections notification code

---
 .../views/default/notifications/subscriptions/collections.php       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'mod/notifications/views')

diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index b8787570d..e9497590d 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -99,10 +99,7 @@ END;
 		<td>&nbsp;</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())) {
 		foreach($collections as $collection) {
 			$members = get_members_of_access_collection($collection->id, true);
@@ -156,7 +153,6 @@ END;
 		}
 	}
 
-*/
 ?>
 </table>
 </div>
-- 
cgit v1.2.3


From ce0348c9e491e4539923f8befa13841384280172 Mon Sep 17 00:00:00 2001
From: Matt Beckett <beck24@gmail.com>
Date: Wed, 27 Jun 2012 13:14:01 -0600
Subject: Empty collections now report 0 members instead of 1

---
 .../views/default/notifications/subscriptions/collections.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'mod/notifications/views')

diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index e9497590d..e48302629 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -103,7 +103,10 @@ END;
 	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);
+      $memberno = 0;
+      if ($members) {
+        $memberno = sizeof($members);
+      }
 			$members = implode(',', $members);
 
 ?>
-- 
cgit v1.2.3


From 15eb56a26007a74f3f73354b0fa5bd221e16a618 Mon Sep 17 00:00:00 2001
From: Matt Beckett <beck24@gmail.com>
Date: Wed, 27 Jun 2012 21:13:07 -0600
Subject: Changed logged in user to contextual user as per Steve Clays fix for
 admin editing user notifications

---
 .../views/default/notifications/subscriptions/collections.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mod/notifications/views')

diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index e48302629..8ce77c4b2 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -100,7 +100,7 @@ END;
 	</tr>
 <?php
 
-	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 = 0;
@@ -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);
 					}
-- 
cgit v1.2.3