Merge remote-tracking branch 'origin/master'

doc/config.rst

@@ -728,6 +728,12 @@ Server connection settings
     :type: string
     :default: ``'mysqli'``
 
+    .. deprecated:: 4.2.0
+
+        This setting was removed. The ``mysql`` extension will only be used when
+        the ``mysqli`` extension is not available. As of 5.0.0, only the
+        ``mysqli`` extension can be used.
+
     The PHP MySQL extension to use (``mysql`` or ``mysqli``).
 
     It is recommended to use ``mysqli`` in all installations.
@@ -3232,7 +3238,7 @@ Theme manager settings
 
     :type: string
     :default: '82%'
-    
+
     .. deprecated:: 5.0.0
 
         This setting was removed as the browser is more efficient,

test/classes/Config/ServerConfigChecksTest.php

@@ -46,7 +46,6 @@ class ServeConfigChecksTest extends PmaTestCase
             '1' => array(
                 'host' => 'localhost',
                 'ssl' => false,
-                'extension' => 'mysql',
                 'auth_type' => 'config',
                 'user' => 'username',
                 'password' => 'password',
@@ -105,7 +104,6 @@ class ServeConfigChecksTest extends PmaTestCase
             '1' => array(
                 'host' => 'localhost',
                 'ssl' => true,
-                'extension' => 'mysqli',
                 'auth_type' => 'cookie',
                 'AllowRoot' => false
             )