From 1f385b8a3d707149d801ef8e183ceecc4da5c9bd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 17 May 2011 06:38:42 -0400
Subject: [PATCH] - Make update_cahce() method to be publicly available
---
program/include/rcube_user.php | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index ca4fb8b..e6ec461 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -154,7 +154,7 @@
$this->language = $_SESSION['language'];
- if ($this->db->affected_rows()) {
+ if ($this->db->affected_rows() !== false) {
$config->set_user_prefs($a_user_prefs);
$this->data['preferences'] = $save_prefs;
return true;
@@ -288,7 +288,7 @@
// we'll not delete last identity
if ($sql_arr['ident_count'] <= 1)
- return false;
+ return -1;
$this->db->query(
"UPDATE ".get_table_name('identities').
@@ -359,16 +359,15 @@
$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);
}
--
Gitblit v1.9.1