summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/cache.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-02-07 09:39:24 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-02-07 09:39:24 +0000
commit5cd626aede5b92cd056bc0e205ac9dedfd96ae05 (patch)
treebc740f4527031ec146d20750cdc29219dcedf648 /wp-inst/wp-includes/cache.php
parentb8572cf16ebc2e5e9afbcaef709326dca2823ebd (diff)
downloadwordpress-mu-5cd626aede5b92cd056bc0e205ac9dedfd96ae05.tar.gz
wordpress-mu-5cd626aede5b92cd056bc0e205ac9dedfd96ae05.tar.xz
wordpress-mu-5cd626aede5b92cd056bc0e205ac9dedfd96ae05.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@523 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/cache.php')
-rw-r--r--wp-inst/wp-includes/cache.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/wp-inst/wp-includes/cache.php b/wp-inst/wp-includes/cache.php
index 4b9bde2..cb20209 100644
--- a/wp-inst/wp-includes/cache.php
+++ b/wp-inst/wp-includes/cache.php
@@ -400,6 +400,9 @@ class WP_Object_Cache {
if (defined('DISABLE_CACHE'))
return;
+ if ( ! defined('ENABLE_CACHE') )
+ return;
+
// Disable the persistent cache if safe_mode is on.
if ( ini_get('safe_mode') && ! defined('ENABLE_CACHE') )
return;