Bug: 14155 Fix searching in VBooks.

horde · Nov 7, 2015 · 644ae49 · 644ae49
1 parent a8c83f9
commit 644ae49
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/turba/lib/Driver/Vbook.php b/turba/lib/Driver/Vbook.php
@@ -85,8 +85,17 @@ protected function _search(array $criteria, array $fields, array $blobFields = a
         /* Add the passed in search criteria to the vbook criteria
          * (which need to be mapped from turba fields to
          * driver-specific fields). */
-        $criteria['AND'][] = $this->makeSearch($this->searchCriteria, 'AND', array());
-        $results = $this->_driver->_search($criteria, $fields, $blobFields);
+        $new_criteria = array();
+        if (empty($criteria['AND'])) {
+            $new_criteria['AND'] = array(
+                $criteria,
+                $this->makeSearch($this->searchCriteria, 'AND', array())
+            );
+        } else {
+            $new_criteria = $criteria;
+            $new_criteria['AND'][] = $this->makeSearch($this->searchCriteria, 'AND', array());
+        }
+        $results = $this->_driver->_search($new_criteria, $fields, $blobFields);
         return $count_only ? count($results) : $results;
     }