diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-08 14:28:36 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-08 14:28:36 +0200 |
| commit | a522971cf853b2f0ccd1b569491a06218ebbaee9 (patch) | |
| tree | cf0e8c6bbe0978cf302b112080370b9a01cf5900 /plugins/password/drivers/sql.php | |
| parent | ea6d6958e0a32c88bf8c00cbd118cfcd48fae096 (diff) | |
| parent | c4723999e21da0b266b0467de6e58cbd26c4b5bf (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts:
program/js/list.js
Diffstat (limited to 'plugins/password/drivers/sql.php')
| -rw-r--r-- | plugins/password/drivers/sql.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php index e02bff146..7a51dfe44 100644 --- a/plugins/password/drivers/sql.php +++ b/plugins/password/drivers/sql.php @@ -34,8 +34,9 @@ class rcube_sql_password $db = $rcmail->get_dbh(); } - if ($err = $db->is_error()) + if ($db->is_error()) { return PASSWORD_ERROR; + } // crypted password if (strpos($sql, '%c') !== FALSE) { @@ -183,8 +184,8 @@ class rcube_sql_password $res = $db->query($sql, $sql_vars); if (!$db->is_error()) { - if (strtolower(substr(trim($query),0,6))=='select') { - if ($result = $db->fetch_array($res)) + if (strtolower(substr(trim($sql),0,6)) == 'select') { + if ($db->fetch_array($res)) return PASSWORD_SUCCESS; } else { // This is the good case: 1 row updated |