diff options
| -rw-r--r-- | db-updater.php | 20 | ||||
| -rw-r--r-- | opml.php | 2 | ||||
| -rw-r--r-- | register.php | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/db-updater.php b/db-updater.php index 8590ee82a..edee3bc83 100644 --- a/db-updater.php +++ b/db-updater.php @@ -36,7 +36,7 @@ function confirmOP() { } </script> -<div class="floatingLogo"><img src="images/logo.png"></div> +<div class="floatingLogo"><img src="images/logo_wide.png"></div> <h1><?php echo __("Database Updater") ?></h1> @@ -92,10 +92,8 @@ function confirmOP() { </form>"; } - return; - } + } else if ($version <= $latest_version && !$op) { - if (!$op) { print_warning(__("Please backup your database before proceeding.")); print "<p>" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>).", $version, $latest_version) . "</p>"; @@ -160,6 +158,20 @@ function confirmOP() { <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> </form>"; + } else if ($version >= $latest_version) { + + print_error(__("Your database schema is from a newer version of Tiny Tiny RSS.")); + + print "<p>" . T_sprintf("Found schema version: <b>%d</b>, required: <b>%d</b>.", $version, $latest_version) . "</p>"; + + print "<p>" . __("Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer version and continue.") . "</p>"; + + print "<form method=\"GET\" action=\"backend.php\"> + <input type=\"hidden\" name=\"op\" value=\"logout\"> + <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> + </form>"; + + } ?> @@ -158,7 +158,7 @@ <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> </head> <body> - <div class=\"floatingLogo\"><img src=\"images/logo.png\"></div> + <div class=\"floatingLogo\"><img src=\"images/logo_wide.png\"></div> <h1>".__('OPML Utility')."</h1>"; db_query($link, "BEGIN"); diff --git a/register.php b/register.php index 86a8824cf..144189f74 100644 --- a/register.php +++ b/register.php @@ -140,7 +140,7 @@ <body> -<div class="floatingLogo"><img src="images/logo.png"></div> +<div class="floatingLogo"><img src="images/logo_wide.png"></div> <h1><?php echo __("Create new account") ?></h1> |