Revert the automatic switch to MySQLi, add a parameter instead.

pydio · Mar 17, 2015 · 88f4d8e · 88f4d8e
1 parent fcf6c1f
commit 88f4d8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/core/classes/dibi/libs/Dibi.php b/core/src/core/classes/dibi/libs/Dibi.php
@@ -94,8 +94,9 @@ public static function connect($config = array(), $name = 0)
 		if ($name) {
 			trigger_error(__METHOD__ . '(): named connections are deprecated.', E_USER_DEPRECATED);
 		}
-        if ($config["driver"] == "mysql" && extension_loaded("mysqli")){
-            $config["driver"] = dibi::$defaultDriver;
+        if ($config["driver"] == "mysql" && isSet($config["use_mysqli"])
+            && $config["use_mysqli"] !== false && extension_loaded("mysqli")){
+            $config["driver"] = "mysqli";
          }
 		return self::$connection = self::$registry[$name] = new DibiConnection($config, $name);
 	}

diff --git a/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml b/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml
@@ -62,6 +62,7 @@
             <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_database" default="pydio" label="Database" description="Database name" type="string" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_username" default="" label="User" description="User name" type="string" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_password" default="" label="Password" description="User password" type="password" mandatory="true"/>
+            <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_use_mysqli" default="false" label="Use MySQLi" description="Use PHP MySQLi extension" type="boolean" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_driver" default="sqlite3" label="Driver" description="Driver type (do not touch)" type="hidden" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDate" default="'Y-m-d'" label="formatDate" description="formatDate (do not touch)" type="hidden" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDateTime" default="'Y-m-d H:i:s'" label="formatDateTime" description="formatDateTime (do not touch)" type="hidden" mandatory="true"/>