Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

1 files changed, 17 insertions, 1 deletions

diff --git a/index.php b/index.php
index 980b9881b..be62fe1f3 100644
--- a/index.php
+++ b/index.php
@@ -184,7 +184,8 @@ function main()
 
     if (!$user && common_config('site', 'private')) {
         $public_actions = array('openidlogin', 'finishopenidlogin',
-                                'recoverpassword', 'api', 'doc');
+                                'recoverpassword', 'api', 'doc',
+                                'opensearch');
         $login_action = 'openidlogin';
         if (!common_config('site', 'openidonly')) {
             $public_actions[] = 'login';
@@ -193,6 +194,21 @@ function main()
         }
         if (!in_array($action, $public_actions) &&
             !preg_match('/rss$/', $action)) {
+
+            // set returnto
+            $rargs =& common_copy_args($args);
+            unset($rargs['action']);
+            if (common_config('site', 'fancy')) {
+                unset($rargs['p']);
+            }
+            if (array_key_exists('submit', $rargs)) {
+                unset($rargs['submit']);
+            }
+            foreach (array_keys($_COOKIE) as $cookie) {
+                unset($rargs[$cookie]);
+            }
+            common_set_returnto(common_local_url($action, $rargs));
+
             common_redirect(common_local_url($login_action));
             return;
         }