diff --git a/ChangeLog b/ChangeLog index 522b8374cb..eca65e75d1 100644 --- a/ChangeLog +++ b/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 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:') . ' ' . PMA_VERSION . '', 'li_pma_version', null, null, diff --git a/js/functions.js b/js/functions.js index cb929f382b..5688aa831d 100644 --- a/js/functions.js +++ b/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 = ''+ + var version_information_message = '' + PMA_messages.strLatestAvailable + ' ' + escapeHtml(data.version) + ''; @@ -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); } } diff --git a/js/messages.php b/js/messages.php index e1fb92038d..e25929ca5b 100644 --- a/js/messages.php +++ b/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.