summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-09-05 06:42:36 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-09-05 06:42:36 +0000
commit494f69637c1dae02bbfbb36a6a1493405c579a9a (patch)
treeebb9ec2ba3e16ebe4462f7f4ba87d61f602bcd9a
parent0766ba1e10b3c20b3868b3d03537d9ed677b6ed7 (diff)
- Password Plugin: Fix %d inserts username instead of domain (#1486088)
git-svn-id: https://svn.roundcube.net/trunk@2925 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/plugins/password/drivers/sql.php4
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 5a85022e7..9d72a4aba 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Password Plugin: Fix %d inserts username instead of domain (#1486088)
- Fix rcube_mdb2::affected_rows() (#1486082)
RELEASE 0.3-stable
diff --git a/roundcubemail/plugins/password/drivers/sql.php b/roundcubemail/plugins/password/drivers/sql.php
index 9afaa65d8..1e737f233 100644
--- a/roundcubemail/plugins/password/drivers/sql.php
+++ b/roundcubemail/plugins/password/drivers/sql.php
@@ -5,7 +5,7 @@
*
* Driver for passwords stored in SQL database
*
- * @version 1.2
+ * @version 1.3
* @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
*
*/
@@ -81,7 +81,7 @@ function password_save($curpass, $passwd)
$user_info = explode('@', $_SESSION['username']);
if (count($user_info) >= 2) {
$sql = str_replace('%l', $db->quote($user_info[0], 'text'), $sql);
- $sql = str_replace('%d', $db->quote($user_info[0], 'text'), $sql);
+ $sql = str_replace('%d', $db->quote($user_info[1], 'text'), $sql);
}
$sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);