diff options
author | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
---|---|---|
committer | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
commit | 0f8ac4e8c5872a6b68b350f96a9ecde0291edefa (patch) | |
tree | ad7938bb4143d5e5a38fd7a8d131e4171aec657d /inc/parser/renderer.php | |
parent | 58ec8fa9128e4581749955de87530f432e387588 (diff) | |
parent | b31fcef02fd24b3e746c9618e77152c7b84c2f2a (diff) | |
download | rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.gz rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.bz2 |
Merge branch 'master' into stable
Diffstat (limited to 'inc/parser/renderer.php')
-rw-r--r-- | inc/parser/renderer.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 7002fd0cb..0923e6896 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -20,6 +20,8 @@ class Doku_Renderer extends DokuWiki_Plugin { 'toc' => true, // render the TOC? ); + var $doc = ''; + // keep some config options var $acronyms = array(); var $smileys = array(); @@ -75,7 +77,7 @@ class Doku_Renderer extends DokuWiki_Plugin { foreach ( $instructions as $instruction ) { // execute the callback against ourself if (method_exists($this,$instruction[0])) { - call_user_func_array(array($this, $instruction[0]),$instruction[1]); + call_user_func_array(array($this, $instruction[0]), $instruction[1] ? $instruction[1] : array()); } } } |