Don't assume we have Content:: available.

Looks like this was never merged back to master.
horde · Apr 2, 2016 · 50843f8 · 50843f8
1 parent 36d513b
commit 50843f8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php
@@ -1088,9 +1088,13 @@ public function delete($object_id, $remove_tags = true)
             $GLOBALS['injector']->getInstance('Turba_Tagger')
                 ->replaceTags($object->getValue('__uid'), array(), $this->getContactOwner(), 'contact');
 
-            /* Tell content we removed the object */
-           $GLOBALS['injector']->getInstance('Content_Objects_Manager')
-                ->delete(array($object->getValue('__uid')), 'contact');
+            /* Tell content we removed the object
+            /* (Might have tags disabled, hence no Content_* objects autoloadable).
+             */
+            try {
+                $GLOBALS['injector']->getInstance('Content_Objects_Manager')
+                    ->delete(array($object->getValue('__uid')), 'contact');
+            } catch (Horde_Exception $e) {}
         }
     }