diff options
| author | cash <cash.costello@gmail.com> | 2012-06-28 19:00:13 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2012-06-28 19:00:13 -0400 |
| commit | 0cb5a8c719b676f57d3436b1c02d56fa3cfdc9be (patch) | |
| tree | 9714004e19e3569594f500253db6ac0d1c3e63e6 /engine | |
| parent | 07f61d6c9d7d7155b9b37befbf5c335bff54db73 (diff) | |
| download | elgg-0cb5a8c719b676f57d3436b1c02d56fa3cfdc9be.tar.gz elgg-0cb5a8c719b676f57d3436b1c02d56fa3cfdc9be.tar.bz2 | |
Fixes #4642 group discussion replies work now
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/notification.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php index 5a2f5f8ac..18faff27f 100644 --- a/engine/lib/notification.php +++ b/engine/lib/notification.php @@ -480,8 +480,8 @@ function object_notifications($event, $object_type, $object) { } if (isset($CONFIG->register_objects[$object_type][$object_subtype])) { - $descr = $CONFIG->register_objects[$object_type][$object_subtype]; - $string = $descr . ": " . $object->getURL(); + $subject = $CONFIG->register_objects[$object_type][$object_subtype]; + $string = $subject . ": " . $object->getURL(); // Get users interested in content from this person and notify them // (Person defined by container_guid so we can also subscribe to groups if we want) @@ -500,16 +500,16 @@ function object_notifications($event, $object_type, $object) { if ($user instanceof ElggUser && !$user->isBanned()) { if (($user->guid != $SESSION['user']->guid) && has_access_to_entity($object, $user) && $object->access_id != ACCESS_PRIVATE) { - $methodstring = elgg_trigger_plugin_hook('notify:entity:message', $object->getType(), array( + $body = elgg_trigger_plugin_hook('notify:entity:message', $object->getType(), array( 'entity' => $object, 'to_entity' => $user, 'method' => $method), $string); - if (empty($methodstring) && $methodstring !== false) { - $methodstring = $string; + if (empty($body) && $body !== false) { + $body = $string; } - if ($methodstring !== false) { - notify_user($user->guid, $object->container_guid, $descr, $methodstring, - NULL, array($method)); + if ($body !== false) { + notify_user($user->guid, $object->container_guid, $subject, $body, + null, array($method)); } } } |