Merge branch '0.9.x' into userflag

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

diff --git a/index.php b/index.php
index 644812bd55ac1c8b1549fd4446189266f3c121af..b1e4f651e4872b1dbf8961a1064c3424fc29972a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -68,6 +68,7 @@ function getPath($req)
  */
 function handleError($error)
 {
+//error_log(print_r($error,1));
     if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
         return;
     }
@@ -143,7 +144,7 @@ function checkMirror($action_obj, $args)
 
 function isLoginAction($action)
 {
-    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register');
+    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds');
 
     $login = null;
 
@@ -239,6 +240,7 @@ function main()
     if (!$user && common_config('site', 'private')
         && !isLoginAction($action)
         && !preg_match('/rss$/', $action)
+        && !preg_match('/^Api/', $action)
     ) {
         common_redirect(common_local_url('login'));
         return;