Correctly receive and catch NoSQL backends here too.

horde · Jun 20, 2014 · bf0a88d · bf0a88d
1 parent edb3056
commit bf0a88d
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/imp/lib/Application.php b/imp/lib/Application.php
@@ -486,13 +486,28 @@ public function nosqlDrivers()
         $out = array();
 
         $backends = array(
-            'Horde_Imap_Client_Cache_Backend_Mongo' => $injector->getInstance('IMP_Factory_Imap')->create()->config->cache_params['backend']->backend,
-            'IMP_Sentmail_Mongo' => $injector->getInstance('IMP_Sentmail')
+            'Horde_Imap_Client_Cache_Backend_Mongo' => function() use ($injector) {
+                $backend = $injector
+                    ->getInstance('IMP_Factory_Imap')
+                    ->create()
+                    ->config
+                    ->cache_params['backend'];
+                if (isset($backend->backend)) {
+                    return $backend->backend;
+                }
+            },
+            'IMP_Sentmail_Mongo' => function() use ($injector) {
+                return $injector->getInstance('IMP_Sentmail');
+            },
         );
 
-        foreach ($backends as $key => $val) {
-            if ($val instanceof $key) {
-                $out[] = $val;
+        foreach ($backends as $key => $func) {
+            try {
+                $val = $func();
+                if ($val instanceof $key) {
+                    $drivers[] = $val;
+                }
+            } catch (Horde_Exception $e) {
             }
         }