From acbd45001c60186bebc2b8ad02ee99857f1215a0 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Mon, 10 Feb 2014 11:38:41 +0100 Subject: [PATCH] Return null on error for UID queries (to remain backwards compatible) --- plugins/libkolab/lib/kolab_storage_cache.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php index 20b28126..d4a8528d 100644 --- a/plugins/libkolab/lib/kolab_storage_cache.php +++ b/plugins/libkolab/lib/kolab_storage_cache.php @@ -453,7 +453,10 @@ class kolab_storage_cache ); if ($this->db->is_error($sql_result)) { - if (!$uids) $result->set_error(true); + if ($uids) { + return null; + } + $result->set_error(true); return $result; } @@ -484,7 +487,10 @@ class kolab_storage_cache } if ($index->is_error()) { - if (!$uids) $result->set_error(true); + if ($uids) { + return null; + } + $result->set_error(true); return $result; }