]> git.wh0rd.org - tt-rss.git/commitdiff
fix redirects after schema upgrade; fix logout requiring valid schema
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 20 Apr 2011 07:46:16 +0000 (11:46 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 20 Apr 2011 07:46:16 +0000 (11:46 +0400)
backend.php
db-updater.php
register.php

index c78284c6affa3aa07de68a280184efd652732674..fdaf2c4668b8973c520d14dcae485194aa7c80e4 100644 (file)
 
        $error = sanity_check($link);
 
-       if ($error['code'] != 0) {
+       if ($error['code'] != 0 && $op != "logout") {
                print json_encode(array("error" => $error));
                return;
        }
index dca3a374d1f46e131da7910e6851f4d631e7dde2..8590ee82a01a70874dcfc3f3a8fa1e66fd885586 100644 (file)
@@ -155,7 +155,8 @@ function confirmOP() {
                print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema
                        version <b>%d</b>.", $num_updates, $version)."</p>";
 
-               print "<form method=\"GET\" action=\"backend.php?op=logout\">
+               print "<form method=\"GET\" action=\"backend.php\">
+                       <input type=\"hidden\" name=\"op\" value=\"logout\">
                        <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
                        </form>";
 
index 2b464dc8fdaea03732c249a7f894edc787332cb5..86a8824cf28d88abcc8a1b835bb7014332cb1639 100644 (file)
                if (!ENABLE_REGISTRATION) {
                        print_error(__("New user registrations are administratively disabled."));
 
-                       print "<p><form method=\"GET\" action=\"backend.php?op=logout\">
+                       print "<p><form method=\"GET\" action=\"backend.php\">
+                               <input type=\"hidden\" name=\"op\" value=\"logout\">
                                <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
                                </form>";
                        return;