diff options
author | Andreas Gohr <andi@splitbrain.org> | 2015-07-01 13:27:34 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2015-07-01 13:27:34 +0200 |
commit | 3f8531c4cdc3b4caf157a1b1e954e160be82064b (patch) | |
tree | 69e4ab5add04cfe1c63f515c80a37651bd5b54e8 /inc/parserutils.php | |
parent | 148205530159f4b6ce26df1c56dd8c461ec1f769 (diff) | |
parent | 19cd38771326eea15b458a160845dfa200c5f9e6 (diff) | |
download | rpg-3f8531c4cdc3b4caf157a1b1e954e160be82064b.tar.gz rpg-3f8531c4cdc3b4caf157a1b1e954e160be82064b.tar.bz2 |
Merge pull request #1215 from splitbrain/wikisyntaxpage
Wiki syntax page and minor
Diffstat (limited to 'inc/parserutils.php')
-rw-r--r-- | inc/parserutils.php | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php index 8650f974f..5b96d39fe 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -121,15 +121,21 @@ function p_cached_output($file, $format='xhtml', $id='') { $cache = new cache_renderer($id, $file, $format); if ($cache->useCache()) { $parsed = $cache->retrieveCache(false); - if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- cachefile {$cache->cache} used -->\n"; + if($conf['allowdebug'] && $format=='xhtml') { + $parsed .= "\n<!-- cachefile {$cache->cache} used -->\n"; + } } else { $parsed = p_render($format, p_cached_instructions($file,false,$id), $info); if ($info['cache'] && $cache->storeCache($parsed)) { // storeCache() attempts to save cachefile - if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- no cachefile used, but created {$cache->cache} -->\n"; + if($conf['allowdebug'] && $format=='xhtml') { + $parsed .= "\n<!-- no cachefile used, but created {$cache->cache} -->\n"; + } }else{ $cache->removeCache(); //try to delete cachefile - if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- no cachefile used, caching forbidden -->\n"; + if($conf['allowdebug'] && $format=='xhtml') { + $parsed .= "\n<!-- no cachefile used, caching forbidden -->\n"; + } } } @@ -616,8 +622,9 @@ function p_sort_modes($a, $b){ * @author Andreas Gohr <andi@splitbrain.org> * * @param string $mode - * @param array|null|false $instructions - * @param array $info returns render info like enabled toc and cache + * @param array|null|false $instructions + * @param array $info returns render info like enabled toc and cache + * @param string $date_at * @return null|string rendered output */ function p_render($mode,$instructions,&$info,$date_at=''){ @@ -632,7 +639,7 @@ function p_render($mode,$instructions,&$info,$date_at=''){ if($date_at) { $Renderer->date_at = $date_at; } - + $Renderer->smileys = getSmileys(); $Renderer->entities = getEntities(); $Renderer->acronyms = getAcronyms(); |