aboutsummaryrefslogtreecommitdiff
path: root/mod/notifications
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2014-01-22 04:05:47 +0100
committerSem <sembrestels@riseup.net>2014-01-22 04:05:47 +0100
commit68614b769f4ae4f28c3f395f47b68baba7c48c64 (patch)
tree2c5a744a3859d27883f92b72aef9cf81f1a947d0 /mod/notifications
parent69e2d8c5d8732042c9319aef1fdea45a82b63e42 (diff)
parentc0295c275d6edbca6c6c8bb51dc199150d0d5fc3 (diff)
downloadelgg-68614b769f4ae4f28c3f395f47b68baba7c48c64.tar.gz
elgg-68614b769f4ae4f28c3f395f47b68baba7c48c64.tar.bz2
Merge branch 'release/1.8.1'
Diffstat (limited to 'mod/notifications')
-rw-r--r--mod/notifications/actions/groupsave.php4
-rw-r--r--mod/notifications/groups.php4
-rw-r--r--mod/notifications/index.php4
-rw-r--r--mod/notifications/views/default/forms/notificationsettings/groupsave.php4
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/forminternals.php4
5 files changed, 10 insertions, 10 deletions
diff --git a/mod/notifications/actions/groupsave.php b/mod/notifications/actions/groupsave.php
index 2dd2a6db3..e79dae5cc 100644
--- a/mod/notifications/actions/groupsave.php
+++ b/mod/notifications/actions/groupsave.php
@@ -21,8 +21,8 @@ $groups = array();
$options = array(
'relationship' => 'member',
'relationship_guid' => $user->guid,
- 'types' => 'group',
- 'limit' => 9999,
+ 'type' => 'group',
+ 'limit' => false,
);
if ($groupmemberships = elgg_get_entities_from_relationship($options)) {
foreach($groupmemberships as $groupmembership) {
diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index 3347d4054..973f3493c 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -28,8 +28,8 @@ $people = array();
$groupmemberships = elgg_get_entities_from_relationship(array(
'relationship' => 'member',
'relationship_guid' => $user->guid,
- 'types' => 'group',
- 'limit' => 9999,
+ 'type' => 'group',
+ 'limit' => false,
));
$body = elgg_view_form('notificationsettings/groupsave', array(), array(
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index cd1857f04..a99622efd 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -27,8 +27,8 @@ $people = array();
if ($people_ents = elgg_get_entities_from_relationship(array(
'relationship' => 'notify',
'relationship_guid' => $user->guid,
- 'types' => 'user',
- 'limit' => 99999,
+ 'type' => 'user',
+ 'limit' => false,
))) {
foreach($people_ents as $ent) {
diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
index 168639ab2..f3e5f693a 100644
--- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php
+++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
@@ -15,8 +15,8 @@ foreach ($NOTIFICATION_HANDLERS as $method => $foo) {
$subsbig[$method] = elgg_get_entities_from_relationship(array(
'relationship' => 'notify' . $method,
'relationship_guid' => $user->guid,
- 'types' => 'group',
- 'limit' => 99999,
+ 'type' => 'group',
+ 'limit' => false,
));
$tmparray = array();
if ($subsbig[$method]) {
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 11f266303..79a7959ac 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -31,8 +31,8 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
$subsbig[$method] = elgg_get_entities_from_relationship(array(
'relationship' => 'notify' . $method,
'relationship_guid' => $user->guid,
- 'types' => 'user',
- 'limit' => 99999,
+ 'type' => 'user',
+ 'limit' => false,
));
}