summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-20 09:54:50 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-20 09:54:50 -0500
commitc0497d28f441d5073736af664c8495a402e7092d (patch)
tree7928ad714301912767f5c085b9018ae23c594216 /actions
parenta0ddbecfbc4f923f0555aebacf726e2e50a92fd1 (diff)
parent8fc7f5204e7ed07b9450b7650bce6317ea8e79ae (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions')
-rw-r--r--actions/api.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/actions/api.php b/actions/api.php
index 21fe4eea3..a27d24492 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -131,14 +131,14 @@ class ApiAction extends Action
'statuses/followers',
'favorites/favorites');
- # If the site is "private", all API methods need authentication
-
+ $fullname = "$this->api_action/$this->api_method";
+
+ // If the site is "private", all API methods except laconica/config
+ // need authentication
if (common_config('site', 'private')) {
- return true;
+ return $fullname != 'laconica/config' || false;
}
- $fullname = "$this->api_action/$this->api_method";
-
if (in_array($fullname, $bareauth)) {
# bareauth: only needs auth if without an argument
if ($this->api_arg) {