Handling of local newer revisions than on update server added

diff --git a/inc/language/update_de.php b/inc/language/update_de.php
index cf3dc46fabd8cdd2fb3805eee50e1cbf4532dc30..72b52081bdd106d888044f003ebd47aa547983f9 100644 (file)
--- a/inc/language/update_de.php
+++ b/inc/language/update_de.php
@@ -51,6 +51,7 @@ addMessages(array(
        'ADMIN_UPDATE_CREATE_TIME' => "Update wurde erstellt",
        'ADMIN_DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.",
        'ADMIN_CANNOT_CHECK_VERSION' => "Konnte Versionsnummer nicht abgleichen! (Fehlende Internet-Verbindung? Server ist down?)",
+       'ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE' => "Die auf Ihrem installierte Revision <span class=\"data\">{?CURR_SVN_REVISION?}</span> ist neuer als die auf dem Server. Dies sollte nicht vorkommen, bitte melden Sie dies im Forum oder Bug-Tracker.",
 ));
 
 // [EOF]

diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 9b1fe93afd78706e9aee4e09237af07be06205f7..33b0d7f7b6353777a17be411cd62100fc617918f 100644 (file)
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -76,9 +76,9 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 
                // Which is the latest version on server?
                $ONLINE = array(
-                       'version'  => str_replace("\n", '', $response[0]),
-                       'changed'  => str_replace("\n", '', $response[1]),
-                       'revision' => str_replace("\n", '', $response[2]),
+                       'version'  => trim(str_replace("\n", '', $response[0])),
+                       'changed'  => trim(str_replace("\n", '', $response[1])),
+                       'revision' => trim(str_replace("\n", '', $response[2])),
                        'code'     => '200 OK'
                );
        } else {
@@ -91,12 +91,15 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 if (empty($ONLINE['version'])) {
        // Disconnected?
        loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')</div>');
-} elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] != getCurrSvnRevision())) {
+} elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrSvnRevision())) {
        // New full-version available (all previous released patches are included in this version!)
        $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2);
 
        // Load template
        loadTemplate('admin_update_download', false, $ONLINE);
+} elseif ($ONLINE['revision'] < getCurrSvnRevision()) {
+       // Installed revision is newer than on server
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}');
 } else {
        // You have the latest version!
        loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_UPDATES_AVAILABLE--}');