Move BINARY modifier to make MYSQL use index again

git-svn-id: https://svn.roundcube.net/trunk@4532 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index ca4fb8b0c..ba5613554 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -359,12 +359,11 @@ 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 username = $mod ?";
+        $sql_result = $dbh->query($query, $host, $user);
 
         // query for matching alias
         if (!($sql_arr = $dbh->fetch_assoc($sql_result))) {