Merge branch 'QA_4_3'

ChangeLog

@@ -12,6 +12,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

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,

js/functions.js

@@ -259,9 +259,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>';
@@ -281,7 +281,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);
     }
 }

js/messages.php

@@ -542,9 +542,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.