From 52106ffd3944a08d189a8b628d93d632d54ea307 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 20 Apr 2016 14:25:23 -0400
Subject: [PATCH] Fix bug where rcube_contacts::get_record() could return cached result when requested record wasn't found (#5218)
---
program/lib/Roundcube/rcube_contacts.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php
index c9c01e4..71549e9 100644
--- a/program/lib/Roundcube/rcube_contacts.php
+++ b/program/lib/Roundcube/rcube_contacts.php
@@ -542,7 +542,7 @@
* @param mixed $id Record identifier(s)
* @param bool $assoc Enables returning associative array
*
- * @return mixed Result object with all record fields or False if not found
+ * @return rcube_result_set|array Result object with all record fields
*/
function get_record($id, $assoc = false)
{
@@ -560,6 +560,8 @@
$this->user_id
);
+ $this->result = null;
+
if ($sql_arr = $this->db->fetch_assoc()) {
$record = $this->convert_db_data($sql_arr);
$this->result = new rcube_result_set(1);
--
Gitblit v1.9.1