diff --git a/ChangeLog b/ChangeLog index c33f32ffd9..f79be09be7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,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 );