Merge branch 'master' of http://goukihq.org/misc/git/laconica-locales

[quix0rs-gnu-social.git] / index.php

diff --git a/index.php b/index.php
index 8a2afbd7f1d4136d97f2556b5ec91d3352c55e45..d387740fc230624fc99e660045877efc88125cb3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -36,7 +36,13 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
     common_redirect(common_local_url('public'));
 }
 
-if (!$user && common_config('site', 'private') && $action != 'login') {
+// If the site is private, and they're not on one of the "public"
+// parts of the site, redirect to login
+
+if (!$user && common_config('site', 'private') &&
+    !in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
+                             'recoverpassword', 'api', 'doc', 'register')))
+{
     common_redirect(common_local_url('login'));
 }