diff options
author | Andrew Dolgov <[email protected]> | 2007-05-05 12:07:38 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2007-05-05 12:07:38 +0100 |
commit | 9e21a5713ffb888ccb3fcc3aa72f9970d4f4a372 (patch) | |
tree | 901d623e73a0a696d98d41cfb89fd12b529ecae3 | |
parent | e98bb2430823760279579da2ffd1ed1360f71e6a (diff) |
handle missing update schema diff in update.php
-rw-r--r-- | tt-rss.css | 2 | ||||
-rw-r--r-- | update.php | 20 | ||||
-rw-r--r-- | utility.css | 11 |
3 files changed, 26 insertions, 7 deletions
diff --git a/tt-rss.css b/tt-rss.css index a12736b7d..57627aa58 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -600,7 +600,7 @@ div.warning { } -div.warning img, div.notice img { +div.warning img, div.notice img, div.error img { vertical-align : middle; padding : 5px; } diff --git a/update.php b/update.php index e3a25f47c..8daacc969 100644 --- a/update.php +++ b/update.php @@ -82,12 +82,22 @@ function confirmOP() { ksort($update_versions, SORT_NUMERIC); $latest_version = max(array_keys($update_versions)); - + if ($version == $latest_version) { - print "<p>".__("Tiny Tiny RSS database is up to date.")."</p>"; - print "<form method=\"GET\" action=\"tt-rss.php\"> - <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> - </form>"; + + if ($version != SCHEMA_VERSION) { + print_error(__("Could not update database")); + + print "<p>" . + __("Could not find necessary schema file, need version:") . + " " . SCHEMA_VERSION . __(", found: ") . $latest_version . "</p>"; + + } else { + print "<p>".__("Tiny Tiny RSS database is up to date.")."</p>"; + print "<form method=\"GET\" action=\"tt-rss.php\"> + <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> + </form>"; + } return; } diff --git a/utility.css b/utility.css index f51182a7a..8a254afc1 100644 --- a/utility.css +++ b/utility.css @@ -47,8 +47,17 @@ div.warning { } -div.warning img, div.notice img { +div.warning img, div.notice img, div.error img { vertical-align : middle; padding : 5px; } +div.error { + border : 1px solid #ff0000; + background : #ffcccc; + padding : 5px; + margin : 0px 0px 5px 0px; + font-size : 9pt; + width : 50%; +} + |