diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-09-14 13:14:28 +0300 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-09-14 13:14:51 +0300 |
commit | c3fefc2e4af45ed13f8f999a180a2af4d738bccf (patch) | |
tree | 10fc243238f88764f81c67a9118203806145bb8f /version_check.php | |
parent | 6a163eaa46171ee0ff7ddf9e7037ffb2f5395bbc (diff) |
Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'version_check.php')
-rw-r--r-- | version_check.php | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/version_check.php b/version_check.php index ae097e88df..e1f2be985b 100644 --- a/version_check.php +++ b/version_check.php @@ -10,19 +10,31 @@ define('PMA_MINIMUM_COMMON', true); require_once 'libraries/common.inc.php'; require_once 'libraries/Util.class.php'; +require_once 'libraries/VersionInformation.php'; // Always send the correct headers header('Content-type: application/json; charset=UTF-8'); -$version = PMA_Util::getLatestVersion(); +$versionInformation = new VersionInformation(); +$versionDetails = $versionInformation->getLatestVersion(); -if (empty($version)) { +if (empty($versionDetails)) { echo json_encode(array()); } else { + $latestCompatible = $versionInformation->getLatestCompatibleVersion( + $versionDetails->releases + ); + if ($latestCompatible != null) { + $version = $latestCompatible['version']; + $date = $latestCompatible['date']; + } else { // fallback to old behavior + $version = $versionDetails->version; + $date = $versionDetails->date; + } echo json_encode( array( - 'version' => (! empty($version->version) ? $version->version : ''), - 'date' => (! empty($version->date) ? $version->date : ''), + 'version' => (! empty($version) ? $version : ''), + 'date' => (! empty($date) ? $date : ''), ) ); } |