summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Williams <andy@andywilliams.me>2017-11-29 09:27:40 +0000
committerAndy Williams <andy@andywilliams.me>2017-11-29 09:27:40 +0000
commit4253b51b591500142c1eaef5458629b0fd43a2d8 (patch)
tree9dfd05a575b15b33ecc6e13b0652be9442929c0e
parente511f2d254d6628f5ab116bef1728980905c729e (diff)
WIKI BUGFIX - don't use the cache if useCache says not to
This may not be the root cause but it fixes things in the meantime
-rw-r--r--public_html/inc/parserutils.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/public_html/inc/parserutils.php b/public_html/inc/parserutils.php
index d17580ed..1231b26d 100644
--- a/public_html/inc/parserutils.php
+++ b/public_html/inc/parserutils.php
@@ -153,6 +153,8 @@ function p_cached_instructions($file,$cacheonly=false,$id='') {
153 if(is_null($run)) $run = array(); 153 if(is_null($run)) $run = array();
154 154
155 $cache = new cache_instructions($id, $file); 155 $cache = new cache_instructions($id, $file);
156 if (!$cache->useCache())
157 return p_get_instructions(io_readWikiPage($file,$id));
156 158
157 if ($cacheonly || $cache->useCache() || (isset($run[$file]) && !defined('DOKU_UNITTEST'))) { 159 if ($cacheonly || $cache->useCache() || (isset($run[$file]) && !defined('DOKU_UNITTEST'))) {
158 return $cache->retrieveCache(); 160 return $cache->retrieveCache();