Merge branch 'nightly' into 'nightly'

[quix0rs-gnu-social.git] / lib / apibareauthaction.php

diff --git a/lib/apibareauthaction.php b/lib/apibareauthaction.php
index 8c20a031e8d84e5c55186bad9d6c12dbc6b92d41..d5bcb59f10cbf30034fc808b884e6353d099fb55 100644 (file)
--- a/lib/apibareauthaction.php
+++ b/lib/apibareauthaction.php
@@ -60,20 +60,6 @@ if (!defined('STATUSNET')) {
  */
 class ApiBareAuthAction extends ApiAuthAction
 {
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     *
-     */
-    function prepare($args)
-    {
-        parent::prepare($args);
-        return true;
-    }
-
     /**
      * Does this API resource require authentication?
      *
@@ -88,11 +74,8 @@ class ApiBareAuthAction extends ApiAuthAction
         }
 
         // check whether a user has been specified somehow
-        $id           = $this->arg('id');
-        $user_id      = $this->arg('user_id');
-        $screen_name  = $this->arg('screen_name');
-
-        if (empty($id) && empty($user_id) && empty($screen_name)) {
+        if (!$this->arg('id') && !$this->arg('user_id')
+                && mb_strlen($this->arg('screen_name'))===0) {
             return true;
         }