From fefb11eb87cf0376a4071a60581f611f94a1ebcb Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 15 Dec 2014 15:45:09 +0530
Subject: [PATCH] bug #4646 Version Check Broken

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog       | 1 +
 index.php       | 2 +-
 js/functions.js | 6 +++---
 js/messages.php | 3 ---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2fedca4b1..83cbc1df4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.3.3.0 (not yet released)
 - bug       The "Recently used tables" setting should be with Nav panel
 - bug #4647 Can't disable Favorites
+- bug #4646 Version Check Broken
 
 4.3.2.0 (2014-12-12)
 - bug #4628 PHP error while exporting schema as PDF
diff --git a/index.php b/index.php
index 635cdda253..97bbeaf36e 100644
--- a/index.php
+++ b/index.php
@@ -369,7 +369,7 @@ if ($GLOBALS['cfg']['VersionCheck']
     $class = 'jsversioncheck';
 }
 PMA_printListItem(
-    __('Version information:') . ' ' . PMA_VERSION,
+    __('Version information:') . ' <span class="version">' . PMA_VERSION . '</span>',
     'li_pma_version',
     null,
     null,
diff --git a/js/functions.js b/js/functions.js
index 58651e279f..144b06ed1d 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -242,9 +242,9 @@ function parseVersionString(str)
 function PMA_current_version(data)
 {
     if (data && data.version && data.date) {
-        var current = parseVersionString(pmaversion);
+        var current = parseVersionString($('span.version').text());
         var latest = parseVersionString(data.version);
-        var version_information_message = '<span>'+
+        var version_information_message = '<span class="latest">' +
             PMA_messages.strLatestAvailable +
             ' ' + escapeHtml(data.version) +
             '</span>';
@@ -264,7 +264,7 @@ function PMA_current_version(data)
         if (latest === current) {
             version_information_message = ' (' + PMA_messages.strUpToDate + ')';
         }
-        $('#li_pma_version span').remove();
+        $('#li_pma_version span.latest').remove();
         $('#li_pma_version').append(version_information_message);
     }
 }
diff --git a/js/messages.php b/js/messages.php
index f8b011cad7..569039f1b7 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -539,9 +539,6 @@ echo "var themeCalendarImage = '" . $GLOBALS['pmaThemeImage']
 /* Image path */
 echo "var pmaThemeImage = '" . $GLOBALS['pmaThemeImage'] . "';\n";
 
-/* Version */
-echo "var pmaversion = '" . PMA_VERSION . "';\n";
-
 echo "var mysql_doc_template = '" . PMA_Util::getMySQLDocuURL('%s') . "';\n";
 
 //Max input vars allowed by PHP.