Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / actions / atompubshowmembership.php

diff --git a/actions/atompubshowmembership.php b/actions/atompubshowmembership.php
index a845ea23dffda6d91e35cc1d5d573792463f8c33..8bf62912f5268eb8fd3891d859d5fb7dd8c12f0b 100644 (file)
--- a/actions/atompubshowmembership.php
+++ b/actions/atompubshowmembership.php
@@ -142,7 +142,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return void
      */
-
     function deleteMembership()
     {
         if (empty($this->auth_user) ||
@@ -152,10 +151,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
                                         " membership."), 403);
         }
 
-        if (Event::handle('StartLeaveGroup', array($this->_group, $this->auth_user))) {
-            Group_member::leave($this->_group->id, $this->auth_user->id);
-            Event::handle('EndLeaveGroup', array($this->_group, $this->auth_user));
-        }
+        $this->auth_user->leaveGroup($this->_group);
 
         return;
     }