Add ability to disable theme caching

diff --git a/framework/Core/lib/Horde/Core/Factory/ThemesBuild.php b/framework/Core/lib/Horde/Core/Factory/ThemesBuild.php
index c57135f..f184d28 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/ThemesBuild.php
+++ b/framework/Core/lib/Horde/Core/Factory/ThemesBuild.php
@@ -74,8 +74,11 @@ class Horde_Core_Factory_ThemesBuild
             return $this->_instances[$sig];
         }
 
-        $cache = $this->_injector->getInstance('Horde_Cache');
-        if ($cache instanceof Horde_Cache_Null) {
+        if (!empty($GLOBALS['conf']['cachethemes'])) {
+            $cache = $this->_injector->getInstance('Horde_Cache');
+        }
+
+        if (!$cache || ($cache instanceof Horde_Cache_Null)) {
             $instance = new Horde_Themes_Build($app, $theme);
         } else {
             $id = $sig . '|' . $GLOBALS['registry']->getVersion($app);

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 3af806d..ade0b17 100644 (file)
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1158,6 +1158,20 @@
     </configsection>
    </case>
   </configswitch>
+
+  <configheader>Theme Caching</configheader>
+  <configdescription>
+   Theme caching optimizes display of themed elements. Caching reduces
+   server load (specifically by dramatically reducing filesystem access), and
+   is HIGHLY RECOMMENDED. &lt;strong&gt;Requires a configured Horde caching
+   backend.&lt;/strong&gt;
+  </configdescription>
+  <configenum name="cachethemes" desc="Cache themes?">false
+   <values>
+    <value desc="No">false</value>
+    <value desc="Yes">true</value>
+   </values>
+  </configenum>
  </configtab>
 
  <configtab name="lock" desc="Lock System">