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

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

diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index 725178fd427bf52d0265909871cdfda465b900eb..21d82f96fd13f20fc41cf77bf247ccc12709d355 100644 (file)
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -29,11 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Tests for the existence of friendship between two users. Will return true if
@@ -47,7 +43,6 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiFriendshipsExistsAction extends ApiPrivateAuthAction
 {
     var $profile_a = null;
@@ -59,10 +54,8 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -77,22 +70,18 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction
      *
      * 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 (empty($this->profile_a) || empty($this->profile_b)) {
             $this->clientError(
-                _('Two valid IDs or screen_names must be supplied.'),
-                400,
-                $this->format
+                // TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
+                _('Two valid IDs or nick names must be supplied.'),
+                400
             );
-            return;
         }
 
         $result = Subscription::exists($this->profile_a, $this->profile_b);
@@ -122,10 +111,8 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction
      *
      * @return boolean is read only action?
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
-
 }