From 7feb606d7f0eed0f88672eaa7824bdcef221c136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 23 May 2016 10:53:13 +0200 Subject: [PATCH] Avoid confusing warning when mysql extension is missing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As mysql extension is deprecated and removed from PHP 7, it makes no sense to recommend it. Fixes #12231 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/database_interface.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 82460a1896..521ef6873c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #12249 Fix cookie path on IIS - issue #11705 Fix occassional 200 errors on Windows - issue #12219 Fix locking issues when importing SQL +- issue #12231 Avoid confusing warning when mysql extension is missing 4.6.1 (2016-05-02) - issue #12120 PMA_Util not found in insert_edit.lib.php diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php index b8ec610db2..def0b777be 100644 --- a/libraries/database_interface.inc.php +++ b/libraries/database_interface.inc.php @@ -43,7 +43,7 @@ if (defined('TESTSUITE')) { if (! PMA\libraries\DatabaseInterface::checkDbExtension($extension)) { // warn about both extensions missing and exit PMA_warnMissingExtension( - 'mysqli|mysql', + 'mysqli', true, $doclink );