From 5cd626aede5b92cd056bc0e205ac9dedfd96ae05 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 7 Feb 2006 09:39:24 +0000
Subject: WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@523 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-inst/wp-includes/cache.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'wp-inst/wp-includes/cache.php')

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;
-- 
cgit