summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-04-20 11:46:16 +0400
committerAndrew Dolgov <[email protected]>2011-04-20 11:46:16 +0400
commit2376ad492574e1ac422efc7e91930667872863d6 (patch)
treeeeee401e8c5b84c52757b9354b66fe2a8f41896e
parent1ca77e0acd1d283112559cbfb3b3aac1802ffc32 (diff)
fix redirects after schema upgrade; fix logout requiring valid schema
-rw-r--r--backend.php2
-rw-r--r--db-updater.php3
-rw-r--r--register.php3
3 files changed, 5 insertions, 3 deletions
diff --git a/backend.php b/backend.php
index c78284c6a..fdaf2c466 100644
--- a/backend.php
+++ b/backend.php
@@ -124,7 +124,7 @@
$error = sanity_check($link);
- if ($error['code'] != 0) {
+ if ($error['code'] != 0 && $op != "logout") {
print json_encode(array("error" => $error));
return;
}
diff --git a/db-updater.php b/db-updater.php
index dca3a374d..8590ee82a 100644
--- a/db-updater.php
+++ b/db-updater.php
@@ -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>";
diff --git a/register.php b/register.php
index 2b464dc8f..86a8824cf 100644
--- a/register.php
+++ b/register.php
@@ -148,7 +148,8 @@
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;