summaryrefslogtreecommitdiff
path: root/roundcubemail/plugins/password/password.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-05-15 18:36:04 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-05-15 18:36:04 +0000
commitb2e958026fe5bafb2afb2cdad6f270ed46f89a15 (patch)
treedc2fde7667fa1e918c6c464022286a681d73b8c0 /roundcubemail/plugins/password/password.php
parent9938c39da8561fc15d7e65fe525093258e997939 (diff)
- typo + rename db_password_dsn to password_db_dsn
git-svn-id: https://svn.roundcube.net/trunk@2488 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/plugins/password/password.php')
-rw-r--r--roundcubemail/plugins/password/password.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/plugins/password/password.php b/roundcubemail/plugins/password/password.php
index f10c43ca9..75befc0d1 100644
--- a/roundcubemail/plugins/password/password.php
+++ b/roundcubemail/plugins/password/password.php
@@ -13,7 +13,7 @@
* Configuration Items (config/main.inc.php):
* password_confirm_current - boolean to determine whether current password
* is required to change password. Defaults to FALSE.
- * db_passwd_dsn - is the PEAR database DSN for performing the query. Defaults
+ * password_db_dsn - is the PEAR database DSN for performing the query. Defaults
* to the default databse setting in config/db.inc.php
* password_query - the SQL query used to change the password.
* If the SQL query is a SELECT it will return an error message in a row if unsuccessful
@@ -208,13 +208,14 @@ class password extends rcube_plugin
if (!($sql = $cfg->get('password_query')))
$sql = "SELECT update_passwd(%c, %u)";
- if ($dsn = $cfg->get('db_passwd_dsn')) {
+ if ($dsn = $cfg->get('password_db_dsn')) {
$db = new rcube_mdb2($dsn, '', FALSE);
$db->set_debug((bool)$cfg->get('sql_debug'));
$db->db_connect('w');
} else {
$db = rcmail::get_instance()->get_dbh();
}
+
if ($err = $db->is_error())
return $err;