From f350e7703f5cc043ca148fa62e5d1e02589aa8f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 12 Sep 2013 09:46:45 +0200 Subject: [PATCH] bug #3997 Error handling in case MySQL extension is missing We can not work with Response object before loading DBI as it uses it. --- ChangeLog | 1 + libraries/common.inc.php | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index adc699ba4f..f9039d847a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug Handle the situation where PHP_SELF is not set - bug #4080 Overwrite existing file not obeyed - bug #3929 Database-specific privileges are not copied when cloning user +- bug #3997 Error handling in case MySQL extension is missing 4.0.6.0 (2013-09-05) - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 3f1f506c6b..46d8eb107a 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -32,7 +32,7 @@ */ /** - * block attempts to directly run this script + * block attempts to directly run this script */ if (getcwd() == dirname(__FILE__)) { die('Attack stopped'); @@ -749,11 +749,6 @@ if (@file_exists($_SESSION['PMA_Theme']->getLayoutFile())) { } if (! defined('PMA_MINIMUM_COMMON')) { - if (! defined('PMA_BYPASS_GET_INSTANCE')) { - // get a dummy object to ensure that the class is instanciated - PMA_Response::getInstance(); - } - /** * Character set conversion. */