Simplify, and ensure we always return an array.

Bug: 12791
horde · Oct 28, 2013 · 22b5441 · 22b5441
1 parent e6c9fb6
commit 22b5441
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Connector.php b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php
@@ -302,21 +302,23 @@ public function contacts_getActionTimestamp($uid, $action)
      */
     public function contacts_search($query, array $options = array())
     {
-        $gal = $this->contacts_getGal();
-        if (!empty($gal)) {
-            $fields = array($gal => array('firstname', 'lastname', 'alias', 'name', 'email', 'office'));
-            if (!empty($options['pictures'])) {
-                $fields[$gal][] = 'photo';
-            }
-            $opts = array(
-                'fields' => $fields,
-                'matchBegin' => true,
-                'forceSource' => true,
-                'sources' => array($gal)
-            );
+        if (!$gal = $this->contacts_getGal()) {
+            return array();
+        }
 
-            return $this->_registry->contacts->search($query, $opts);
+        $fields = array($gal => array('firstname', 'lastname', 'alias', 'name', 'email', 'office'));
+        if (!empty($options['pictures'])) {
+            $fields[$gal][] = 'photo';
         }
+        $opts = array(
+            'fields' => $fields,
+            'matchBegin' => true,
+            'forceSource' => true,
+            'sources' => array($gal)
+        );
+
+        return $this->_registry->contacts->search($query, $opts);
+
     }
 
     /**