Fixes #2561 only triggering join, group event if the add relationship succeeded

git-svn-id: http://code.elgg.org/elgg/trunk@7799 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/group.php b/engine/lib/group.php
index c6bd27f2d484f84815ff23d615c6b7756985bc14..3b42de02f8c575c74f1a0faa796ce362a3d5a745 100644 (file)
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -567,8 +567,10 @@ function is_group_member($group_guid, $user_guid) {
 function join_group($group_guid, $user_guid) {
        $result = add_entity_relationship($user_guid, 'member', $group_guid);
 
-       $params = array('group' => get_entity($group_guid), 'user' => get_entity($user_guid));
-       elgg_trigger_event('join', 'group', $params);
+       if ($result) {
+               $params = array('group' => get_entity($group_guid), 'user' => get_entity($user_guid));
+               elgg_trigger_event('join', 'group', $params);
+       }
 
        return $result;
 }