Should not be throwing exception if an individual search driver fails

See Bug #13171 : My search results suddenly became empty because one of my search drivers (Facebook) suddenly started failing. For a remote API call, we should be trying to return as many matches as possible while ignoring errors.
horde · May 7, 2014 · 1e61b6d · 1e61b6d
1 parent 9379430
commit 1e61b6d
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/turba/lib/Api.php b/turba/lib/Api.php
@@ -1179,15 +1179,20 @@ public function search($names = null, array $opts = array())
                     }
                 }
 
-                $search = $sdriver->search(
-                    $criteria,
-                    Turba::getPreferredSortOrder(),
-                    'OR',
-                    $opts['returnFields'],
-                    $opts['customStrict'],
-                    $opts['matchBegin'],
-                    $opts['count_only']
-                );
+                try {
+                    $search = $sdriver->search(
+                        $criteria,
+                        Turba::getPreferredSortOrder(),
+                        'OR',
+                        $opts['returnFields'],
+                        $opts['customStrict'],
+                        $opts['matchBegin'],
+                        $opts['count_only']
+                    );
+                } catch (Exception $e) {
+                    continue;
+                }
+
                 if ($opts['count_only']) {
                     $results += $search;