Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 6b069c4fcfe09f7107e4bf01174950c47a6f0080..31f47ce2f15f59dd0d07ded6e9991e0a9bf22cde 100644 (file)
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -29,11 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apibareauth.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Outputs detailed information about the relationship between two users
@@ -58,7 +54,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -68,17 +64,17 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
         $target_screen_name = $this->trimmed('target_screen_name');
 
         if (!empty($source_id)) {
-            $this->source = User::staticGet($source_id);
+            $this->source = User::getKV($source_id);
         } elseif (!empty($source_screen_name)) {
-            $this->source = User::staticGet('nickname', $source_screen_name);
+            $this->source = User::getKV('nickname', $source_screen_name);
         } else {
             $this->source = $this->auth_user;
         }
 
         if (!empty($target_id)) {
-            $this->target = User::staticGet($target_id);
+            $this->target = User::getKV($target_id);
         } elseif (!empty($target_screen_name)) {
-            $this->target = User::staticGet('nickname', $target_screen_name);
+            $this->target = User::getKV('nickname', $target_screen_name);
         }
 
         return true;
@@ -111,18 +107,15 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
      *
      * Check the format and show the user info
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            // TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+            // TRANS: Client error displayed when coming across a non-supported API method.
             $this->clientError(_('API method not found.'), 404);
-            return;
         }
 
         if (empty($this->source)) {
@@ -131,7 +124,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
                 _('Could not determine source user.'),
                 404
              );
-            return;
         }
 
         if (empty($this->target)) {
@@ -140,7 +132,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
                 _('Could not find target user.'),
                 404
             );
-            return;
         }
 
         $result = $this->twitterRelationshipArray($this->source, $this->target);
@@ -171,7 +162,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
      * @return boolean is read only action?
      */
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }