Merge branch 'pdo'

Conflicts:
	CHANGELOG

2 files changed, 4 insertions, 4 deletions

diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index e9207300e..449e2df5b 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -26,7 +26,7 @@ class rcube_sql_password
     	    else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
 	            $dsn .= '?new_link=true';
 
-            $db = new rcube_mdb2($dsn, '', FALSE);
+            $db = rcube_db::factory($dsn, '', false);
             $db->set_debug((bool)$rcmail->config->get('sql_debug'));
             $db->db_connect('w');
         }
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index ee6bcc04b..bfa489ae5 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -151,10 +151,10 @@ class squirrelmail_usercopy extends rcube_plugin
 			$this->prefs = array();
 
 			/* connect to squirrelmail database */
-			$db = new rcube_mdb2($rcmail->config->get('squirrelmail_dsn'));
-			$db->db_connect('r'); // connect in read mode
+			$db = rcube_db::factory($rcmail->config->get('squirrelmail_dsn'));
 
-			// $db->set_debug(true);
+			$db->set_debug($rcmail->config->get('sql_debug'));
+			$db->db_connect('r'); // connect in read mode
 
 			/* retrieve prefs */
 			$userprefs_table = $rcmail->config->get('squirrelmail_userprefs_table');