This requires the contacts API to be present as well.

Fixes edge case where a fatal error is thrown when IMP is installed, but Turba isn't.
horde · Feb 17, 2016 · 8d03365 · 8d03365
1 parent 77ed680
commit 8d03365
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Connector.php b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php
@@ -358,7 +358,8 @@ public function contacts_getActionTimestamp($uid, $action, $addressbook = null)
      */
     public function getRecipientCache($max = 100)
     {
-        if (!$this->_registry->hasInterface('mail')) {
+        if (!$this->_registry->hasInterface('mail') ||
+            !$this->_registry->hasInterface('contacts')) {
             return array();
         }
         $cache = $GLOBALS['injector']->getInstance('Horde_Cache');

diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Driver.php b/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
@@ -477,7 +477,8 @@ public function getFolders()
                     }
                 }
             }
-            if ($this->_version > Horde_ActiveSync::VERSION_TWELVEONE) {
+            if ($this->_version > Horde_ActiveSync::VERSION_TWELVEONE &&
+                $GLOBALS['registry']->hasInterface('contacts')) {
                 $folders[] = $this->_getFolder('RI', array('class' => 'RI'));
             }