Add config option to disable caching.

diff --git a/chora/config/conf.xml b/chora/config/conf.xml
index 6da82c6..b4260a2 100644 (file)
--- a/chora/config/conf.xml
+++ b/chora/config/conf.xml
@@ -105,6 +105,11 @@
   </configenum>
  </configtab>
 
+ <configtab name="cache" desc="Caching">
+  <configboolean name="caching" desc="Allow caching of views? This requires
+  that a caching backend be configured in Horde.">false</configboolean>
+ </configtab>
+
  <configtab name="menu" desc="Menu Settings">
   <configsection name="menu">
    <configheader>Menu Settings</configheader>

diff --git a/chora/docs/CHANGES b/chora/docs/CHANGES
index 665bdf3..fe37b9a 100644 (file)
--- a/chora/docs/CHANGES
+++ b/chora/docs/CHANGES
@@ -2,6 +2,7 @@
 v3.0-git
 --------
 
+[mms] Add configuration option to disable caching.
 [mms] Move log entries in annotate screen to an AJAX request.
 [mms] Add support for git repositories.
 

diff --git a/chora/lib/base.php b/chora/lib/base.php
index baca733..f055d07 100644 (file)
--- a/chora/lib/base.php
+++ b/chora/lib/base.php
@@ -45,7 +45,9 @@ $notification = &Notification::singleton();
 $notification->attach('status');
 
 // Cache.
-$cache = &Horde_Cache::singleton($conf['cache']['driver'], Horde::getDriverConfig('cache', $conf['cache']['driver']));
+if (!empty($conf['caching'])) {
+    $cache = &Horde_Cache::singleton($conf['cache']['driver'], Horde::getDriverConfig('cache', $conf['cache']['driver']));
+}
 
 // Horde base libraries.
 require_once 'Horde/Text.php';