X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapifriendshipsshow.php;h=5810e148747452ba808ccc4319429b56fd0b3ca7;hb=8616055959c6ac4ae91fe5fc62e8c8ac2aa7257c;hp=1eaca49f0e9a5449f692c17dc4eec43e0217d1ad;hpb=7d64d8c78cfa102b91975598ef9e574d2ef14b8c;p=quix0rs-gnu-social.git

diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 1eaca49f0e..5810e14874 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Outputs detailed information about the relationship between two users
  *
@@ -68,17 +66,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;
@@ -122,7 +120,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
         if (!in_array($this->format, array('xml', 'json'))) {
             // 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 +128,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
                 _('Could not determine source user.'),
                 404
              );
-            return;
         }
 
         if (empty($this->target)) {
@@ -140,7 +136,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
                 _('Could not find target user.'),
                 404
             );
-            return;
         }
 
         $result = $this->twitterRelationshipArray($this->source, $this->target);