diff options
author | alecpl <alec@alec.pl> | 2011-02-16 09:42:31 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-02-16 09:42:31 +0000 |
commit | 1a2754d18ca079ea55e4c272d7cdc9dc33c00179 (patch) | |
tree | eb9f682373ab46319363d60a9b19ca2a917e5430 /program/include/rcube_user.php | |
parent | 4ef242af12bff50db0da28b5279c172781139cde (diff) |
- Applied fixes from trunk
Diffstat (limited to 'program/include/rcube_user.php')
-rw-r--r-- | program/include/rcube_user.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php index ee6db77cc..6e7591d0f 100644 --- a/program/include/rcube_user.php +++ b/program/include/rcube_user.php @@ -359,16 +359,15 @@ class rcube_user $dbh = rcmail::get_instance()->get_dbh(); // use BINARY (case-sensitive) comparison on MySQL, other engines are case-sensitive - $prefix = preg_match('/^mysql/', $dbh->db_provider) ? 'BINARY ' : ''; + $mod = preg_match('/^mysql/', $dbh->db_provider) ? 'BINARY' : ''; // query for matching user name - $query = "SELECT * FROM ".get_table_name('users')." WHERE mail_host = ? AND %s = ?"; - - $sql_result = $dbh->query(sprintf($query, $prefix.'username'), $host, $user); + $query = "SELECT * FROM ".get_table_name('users')." WHERE mail_host = ? AND %s = $mod ?"; + $sql_result = $dbh->query(sprintf($query, 'username'), $host, $user); // query for matching alias if (!($sql_arr = $dbh->fetch_assoc($sql_result))) { - $sql_result = $dbh->query(sprintf($query, $prefix.'alias'), $host, $user); + $sql_result = $dbh->query(sprintf($query, 'alias'), $host, $user); $sql_arr = $dbh->fetch_assoc($sql_result); } |