diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-09-22 16:59:20 +0300 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-09-22 16:59:20 +0300 |
commit | 9730b16dd0e707d471796032d26a96782b70897f (patch) | |
tree | 5090e5f541f60e77e0d0530676e31ddb7d6627d6 /version_check.php | |
parent | d81165f34555c5202d8150ae1d080834dd601d5b (diff) |
issue #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 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/version_check.php b/version_check.php index e27d8db9b3..b2f00bc0d9 100644 --- a/version_check.php +++ b/version_check.php @@ -9,6 +9,7 @@ // Sets up the session define('PMA_MINIMUM_COMMON', true); require_once 'libraries/common.inc.php'; +require_once 'libraries/Util.class.php'; // Get response text from phpmyadmin.net or from the session // Update cache every 6 hours @@ -34,7 +35,18 @@ header('Content-type: application/json; charset=UTF-8'); // Save and forward the response only if in valid format $data = json_decode($response); -if (is_object($data) && strlen($data->version) && strlen($data->date)) { +if (is_object($data)) { + $latestCompatible = PMA_Util::getLatestCompatibleVersion( + $data->releases + ); + + $version = ''; + $date = ''; + if ($latestCompatible != null) { + $version = $latestCompatible['version']; + $date = $latestCompatible['date']; + } + if ($save) { $_SESSION['cache']['version_check'] = array( 'response' => $response, @@ -42,7 +54,10 @@ if (is_object($data) && strlen($data->version) && strlen($data->date)) { ); } echo json_encode( - array('version' => $data->version, 'date' => $data->date) + array( + 'version' => (! empty($version) ? $version : ''), + 'date' => (! empty($date) ? $date : ''), + ) ); } |