Fix defaulting to default 'search' fields.

horde · Oct 7, 2014 · e18ea0c · e18ea0c
1 parent fa8feba
commit e18ea0c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/turba/lib/Api.php b/turba/lib/Api.php
@@ -1163,6 +1163,9 @@ public function search($names = null, array $opts = array())
                 continue;
             }
 
+            if (empty($opts['fields'][$source])) {
+                $opts['fields'][$source] = $GLOBALS['cfgSources'][$source]['search'];
+            }
             $sdriver = $driver->create($source);
 
             foreach ($names as $name) {
@@ -1176,9 +1179,6 @@ public function search($names = null, array $opts = array())
                             $criteria[$field] = $trimname;
                         }
                     }
-                    if (!count($criteria)) {
-                        $criteria = $cfgSources[$source]['search'];
-                    }
                 }
 
                 try {