summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-02-03 12:30:14 +0000
committerDries Buytaert <dries@buytaert.net>2009-02-03 12:30:14 +0000
commitd4867346f578906751f8ea0bd799c3fc1bfcbf48 (patch)
treeb5ea49cfb114cfc7cbbd37cf83908164e2bbe6e8 /includes
parentff1e4c669a64276a0d5c377bf69c1268c1fb796f (diff)
downloadbrdo-d4867346f578906751f8ea0bd799c3fc1bfcbf48.tar.gz
brdo-d4867346f578906751f8ea0bd799c3fc1bfcbf48.tar.bz2
- Patch #367380 by Moshe: make block module optional.
Diffstat (limited to 'includes')
-rw-r--r--includes/cache.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/cache.inc b/includes/cache.inc
index a7ad16214..21f79ba6b 100644
--- a/includes/cache.inc
+++ b/includes/cache.inc
@@ -150,7 +150,9 @@ function cache_clear_all($cid = NULL, $table = NULL, $wildcard = FALSE) {
if (!isset($cid) && !isset($table)) {
// Clear the block cache first, so stale data will
// not end up in the page cache.
- cache_clear_all(NULL, 'cache_block');
+ if (module_exists('block')) {
+ cache_clear_all(NULL, 'cache_block');
+ }
cache_clear_all(NULL, 'cache_page');
return;
}