Changeset 4313 in subversion

Timestamp:

Dec 7, 2010 8:09:13 AM (2 years ago)

Author:

thomasb

Message:

Fix: searches can have zero results

File:

• trunk/plugins/kolab_addressbook/rcube_kolab_contacts.php (modified) (3 diffs)

trunk/plugins/kolab_addressbook/rcube_kolab_contacts.php

@@ -188 +188 @@
             foreach ((array)$this->distlists[$this->gid]['member'] as $member) {
                 // skip member that don't match the search filter
-                if ($this->filter && array_search($member['ID'], $this->filter) === false)
+                if (is_array($this->filter) && array_search($member['ID'], $this->filter) === false)
                     continue;
                 if ($this->contacts[$member['ID']] && !$seen[$member['ID']]++)
@@ -196 +196 @@
         }
         else
-            $ids = $this->filter ? $this->filter : array_keys($this->contacts);
+            $ids = is_array($this->filter) ? $this->filter : array_keys($this->contacts);
         
         // fill contact data into the current result set
@@ -272 +272 @@
         $this->_fetch_contacts();
         $this->_fetch_groups();
-        $count = $this->gid ? count($this->distlists[$this->gid]['member']) : ($this->filter ? count($this->filter) : count($this->contacts));
+        $count = $this->gid ? count($this->distlists[$this->gid]['member']) : (is_array($this->filter) ? count($this->filter) : count($this->contacts));
         return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
     }