From 7786ba1adb415fc8fd4478380d7201702a799483 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 20 May 2011 04:00:40 -0400
Subject: [PATCH] - Fix error when rcube_cache::remove() was used in pattern mode
---
program/include/rcube_user.php | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index ee6db77..e6ec461 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -5,7 +5,7 @@
| program/include/rcube_user.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland |
+ | Copyright (C) 2005-2010, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -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