[jan] Don't try to load Content application if tags are disabled.

Conflicts: turba/docs/CHANGES turba/package.xml
horde · Mar 20, 2015 · f283c1a · f283c1a
1 parent 5288a63
commit f283c1a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
@@ -9,10 +9,12 @@ v4.3.0-git
 [jan] Support multi-value RDNs in LDAP DN attributes (horde@iotti.biz, Request
       #11889).
 
+
 ------
 v4.2.6
 ------
 
+[jan] Don't try to load Content application if tags are disabled.
 [mjr] Fix adding tags to new contacts (Bug #13884).
 [jan] Fix waiting for replication on LDAP backend.
 

diff --git a/turba/lib/Application.php b/turba/lib/Application.php
@@ -85,17 +85,19 @@ protected function _bootstrap()
      */
     protected function _init()
     {
-        global $injector, $registry, $session;
-
-        /* For now, autoloading the Content_* classes depend on there being a
-         * registry entry for the 'content' application that contains at least
-         * the fileroot entry. */
-        $injector->getInstance('Horde_Autoloader')
-            ->addClassPathMapper(
-                new Horde_Autoloader_ClassPathMapper_Prefix('/^Content_/', $registry->get('fileroot', 'content') . '/lib/'));
-
-        if (!class_exists('Content_Tagger')) {
-            throw new Horde_Exception(_("The Content_Tagger class could not be found. Make sure the Content application is installed."));
+        global $conf, $injector, $registry, $session;
+
+        if ($conf['tags']['enabled']) {
+            /* For now, autoloading the Content_* classes depend on there being
+             * a registry entry for the 'content' application that contains at
+             * least the fileroot entry. */
+            $injector->getInstance('Horde_Autoloader')
+                ->addClassPathMapper(
+                    new Horde_Autoloader_ClassPathMapper_Prefix('/^Content_/', $registry->get('fileroot', 'content') . '/lib/'));
+
+            if (!class_exists('Content_Tagger')) {
+                throw new Horde_Exception(_("The Content_Tagger class could not be found. Make sure the Content application is installed."));
+            }
         }
 
         // Turba source and attribute configuration.

diff --git a/turba/package.xml b/turba/package.xml
@@ -1979,6 +1979,7 @@
    <date>2015-02-10</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
+* [jan] Don&apos;t try to load Content application if tags are disabled.
 * [mjr] Fix adding tags to new contacts (Bug #13884).
 * [jan] Fix waiting for replication on LDAP backend.
    </notes>