Catch error.

Prevents fatal errors in EAS searching due to folders not being found or being able to be opened. Fixes issues with broken clients requesting search results from the Outbox.
horde · Feb 26, 2016 · 722108b · 722108b
1 parent 5ab6f8e
commit 722108b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Driver.php b/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
@@ -2039,9 +2039,14 @@ public function getSearchResults($type, array $query)
             if (!empty($this->_cache) && $this->_cache->exists($cache_key, 0)) {
                 $results = json_decode($this->_cache->get($cache_key, 0), true);
             } else {
-                $results = $this->_searchMailbox($query);
-                if (!empty($this->_cache)) {
-                    $this->_cache->set($cache_key, json_encode($results));
+                try {
+                    $results = $this->_searchMailbox($query);
+                    if (!empty($this->_cache)) {
+                        $this->_cache->set($cache_key, json_encode($results));
+                    }
+                } catch (Horde_ActiveSync_Exception $e) {
+                    $this->_logger->err($e->getMessage());
+                    $results = array();
                 }
             }