From: Andrew Dolgov Date: Wed, 20 Apr 2011 07:52:17 +0000 (+0400) Subject: db-updater: properly handle situation of newer active schema; utility scripts: fix... X-Git-Tag: 1.5.3~18 X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=0ae2bb2a69c3691c2301fc66b46624447d0c8d32 db-updater: properly handle situation of newer active schema; utility scripts: fix incorrect logo --- diff --git a/db-updater.php b/db-updater.php index 8590ee82..edee3bc8 100644 --- a/db-updater.php +++ b/db-updater.php @@ -36,7 +36,7 @@ function confirmOP() { } -

@@ -92,10 +92,8 @@ function confirmOP() { "; } - return; - } + } else if ($version <= $latest_version && !$op) { - if (!$op) { print_warning(__("Please backup your database before proceeding.")); print "

" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (%d to %d).", $version, $latest_version) . "

"; @@ -160,6 +158,20 @@ function confirmOP() { "; + } else if ($version >= $latest_version) { + + print_error(__("Your database schema is from a newer version of Tiny Tiny RSS.")); + + print "

" . T_sprintf("Found schema version: %d, required: %d.", $version, $latest_version) . "

"; + + print "

" . __("Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer version and continue.") . "

"; + + print ""; + + } ?> diff --git a/opml.php b/opml.php index 40ea2637..2e1eb84c 100644 --- a/opml.php +++ b/opml.php @@ -158,7 +158,7 @@ -

".__('OPML Utility')."

"; db_query($link, "BEGIN"); diff --git a/register.php b/register.php index 86a8824c..144189f7 100644 --- a/register.php +++ b/register.php @@ -140,7 +140,7 @@ -