diff options
author | Evan Prodromou <evan@status.net> | 2010-09-15 23:31:20 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-15 23:31:20 -0400 |
commit | 670ad53215eaaa40a55a1977b373a62940c50a42 (patch) | |
tree | 5030420047361499de6d434d5a9315de4662e212 /lib/apibareauth.php | |
parent | 1ceb93cce483794582f1a928de27592acb4f89cf (diff) | |
parent | dffec9f223c1e45832d274c34f7bd6624cbf87ea (diff) |
Merge branch '0.9.x' into activityexport
Diffstat (limited to 'lib/apibareauth.php')
-rw-r--r-- | lib/apibareauth.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/apibareauth.php b/lib/apibareauth.php index da7af1261..00e0f205b 100644 --- a/lib/apibareauth.php +++ b/lib/apibareauth.php @@ -30,7 +30,7 @@ * @author Evan Prodromou <evan@status.net> * @author mEDI <medi@milaro.net> * @author Sarven Capadisli <csarven@status.net> - * @author Zach Copley <zach@status.net> + * @author Zach Copley <zach@status.net> * @copyright 2009 StatusNet, Inc. * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 @@ -60,7 +60,6 @@ require_once INSTALLDIR.'/lib/apiauth.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 ApiBareAuthAction extends ApiAuthAction { @@ -72,7 +71,6 @@ class ApiBareAuthAction extends ApiAuthAction * @return boolean success flag * */ - function prepare($args) { parent::prepare($args); @@ -84,18 +82,15 @@ class ApiBareAuthAction extends ApiAuthAction * * @return boolean true or false */ - function requiresAuth() { // If the site is "private", all API methods except statusnet/config // need authentication - if (common_config('site', 'private')) { return true; } // check whether a user has been specified somehow - $id = $this->arg('id'); $user_id = $this->arg('user_id'); $screen_name = $this->arg('screen_name'); @@ -106,5 +101,4 @@ class ApiBareAuthAction extends ApiAuthAction return false; } - } |