Email notify-on-fave moved to Profile_prefs (run upgrade.php)

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

diff --git a/actions/atompubshowmembership.php b/actions/atompubshowmembership.php
index 098cca8b3eb2dd26bf16d20c4a82432e1c4b0bb3..ad6aa6c1d05db3bf00bf0ec3bff912a01a27235a 100644 (file)
--- a/actions/atompubshowmembership.php
+++ b/actions/atompubshowmembership.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show (or delete) a single membership event as an ActivityStreams entry
  *
@@ -65,7 +63,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
 
         $profileId = $this->trimmed('profile');
 
-        $this->_profile = Profile::staticGet('id', $profileId);
+        $this->_profile = Profile::getKV('id', $profileId);
 
         if (empty($this->_profile)) {
             // TRANS: Client exception.
@@ -74,7 +72,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
 
         $groupId = $this->trimmed('group');
 
-        $this->_group = User_group::staticGet('id', $groupId);
+        $this->_group = User_group::getKV('id', $groupId);
 
         if (empty($this->_group)) {
             // TRANS: Client exception thrown when referencing a non-existing group.
@@ -151,10 +149,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;
     }