summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-08 08:21:45 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-08 08:21:45 +0200
commitde56ea1909d515d3e4807a04a6c4644b8226d08d (patch)
treec8ad7166af152fe14887022e64b8a0de896cdfda /plugins
parentd55c02ba0334192103344dd54701cec066aa65b5 (diff)
parentc2b20fc0b4c6c1271fff9a85cb977d23de0a3421 (diff)
Merge branch 'pdo'
Conflicts: CHANGELOG
Diffstat (limited to 'plugins')
-rw-r--r--plugins/password/drivers/sql.php2
-rw-r--r--plugins/squirrelmail_usercopy/squirrelmail_usercopy.php6
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');