Improve ShownoticeAction remote redirect code

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

diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 0a5333128069bd7c11aaac7739b1999af3f41c69..e5ca8b0a5a3251d7241fe0f2122a41c100cecffb 100644 (file)
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Feed of group memberships for a user, in ActivityStreams format
  *
@@ -64,7 +62,7 @@ class AtompubmembershipfeedAction 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.
@@ -237,8 +235,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
         if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
             if ($activity->verb != ActivityVerb::JOIN) {
-                // TRANS: Client error displayed when not using the POST verb.
-                // TRANS: Do not translate POST.
+                // TRANS: Client error displayed when not using the join verb.
                 throw new ClientException(_('Can only handle join activities.'));
                 return;
             }
@@ -251,7 +248,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
                 return;
             }
 
-            $group = User_group::staticGet('uri', $groupObj->id);
+            $group = User_group::getKV('uri', $groupObj->id);
 
             if (empty($group)) {
                 // XXX: import from listed URL or something