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

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

diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
index aeff0cbf2a5c6bcec305c41535278f7eb0e8e7ce..04681f3445133a5a8a5f11470a95a5fbabb77c9d 100644 (file)
--- a/actions/atompubshowsubscription.php
+++ b/actions/atompubshowsubscription.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show a single subscription
  *
@@ -64,7 +62,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         parent::prepare($argarray);
         $subscriberId = $this->trimmed('subscriber');
 
-        $this->_subscriber = Profile::staticGet('id', $subscriberId);
+        $this->_subscriber = Profile::getKV('id', $subscriberId);
 
         if (empty($this->_subscriber)) {
             // TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -75,7 +73,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
 
         $subscribedId = $this->trimmed('subscribed');
 
-        $this->_subscribed = Profile::staticGet('id', $subscribedId);
+        $this->_subscribed = Profile::getKV('id', $subscribedId);
 
         if (empty($this->_subscribed)) {
             // TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -120,7 +118,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         default:
             // TRANS: Client error shown when using a non-supported HTTP method.
             $this->clientError(_('HTTP method not supported.'), 405);
-            return;
         }
 
         return;