diff --git a/ChangeLog b/ChangeLog index e0a965fd43..ed2bc13cda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - issue #11627 CREATE TABLE/INSERT INTO executed twice (ctrl+enter) - issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given - issue #11632 Exporting GIS visualization ignores start and row count +- issue #11476 Errors instead of git info when PHP has no gzip support 4.5.1.0 (2015-10-23) - issue Invalid argument supplied for foreach() diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 67b1ca1e1a..cfb4b66568 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -500,7 +500,9 @@ class PMA_Config } $commit = false; - if (! isset($_SESSION['PMA_VERSION_COMMITDATA_' . $hash])) { + if (isset($_SESSION['PMA_VERSION_COMMITDATA_' . $hash])) { + $commit = $_SESSION['PMA_VERSION_COMMITDATA_' . $hash]; + } elseif (function_exists('gzuncompress')) { $git_file_name = $git_folder . '/objects/' . substr($hash, 0, 2) . '/' . substr($hash, 2); if (file_exists($git_file_name) ) { @@ -648,8 +650,6 @@ class PMA_Config fclose($pack_file); } } - } else { - $commit = $_SESSION['PMA_VERSION_COMMITDATA_' . $hash]; } // check if commit exists in Github