From 7fb11ef6a91857ff37184487a994ea0017835d67 Mon Sep 17 00:00:00 2001 From: thomascube Date: Sat, 12 Feb 2011 14:14:11 +0000 Subject: [PATCH] Move BINARY modifier to make MYSQL use index again --- program/include/rcube_user.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php index ca4fb8b0c..ba5613554 100644 --- a/program/include/rcube_user.php +++ b/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))) {