diff options
| -rw-r--r-- | inc/actions.php | 2 | ||||
| -rw-r--r-- | inc/cache.php | 2 | ||||
| -rw-r--r-- | inc/parser/handler.php | 1 | ||||
| -rw-r--r-- | inc/template.php | 3 | ||||
| -rw-r--r-- | lib/plugins/syntax.php | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/inc/actions.php b/inc/actions.php index ef09a0dc7..2953c0e79 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -644,7 +644,7 @@ function act_export($act){ $output = p_wiki_xhtml($ID,$REV,false); break; default: - $output = p_cached_output(wikiFN($ID,$REV), $mode); + $output = p_cached_output(wikiFN($ID,$REV), $mode, $ID); $headers = p_get_metadata($ID,"format $mode"); break; } diff --git a/inc/cache.php b/inc/cache.php index 6817e771b..064174fc7 100644 --- a/inc/cache.php +++ b/inc/cache.php @@ -50,7 +50,7 @@ class cache { $this->_addDependencies(); if ($this->_event) { - return $this->_stats(trigger_event($this->_event,$this,array($this,'_useCache'))); + return $this->_stats(trigger_event($this->_event, $this, array($this,'_useCache'))); } else { return $this->_stats($this->_useCache()); } diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 5e0aa6ff4..62a1c241e 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -71,6 +71,7 @@ class Doku_Handler { */ function plugin($match, $state, $pos, $pluginname){ $data = array($match); + /** @var DokuWiki_Syntax_Plugin $plugin */ $plugin = plugin_load('syntax',$pluginname); if($plugin != null){ $data = $plugin->handle($match, $state, $pos, $this); diff --git a/inc/template.php b/inc/template.php index 31a65ce61..eb88732c4 100644 --- a/inc/template.php +++ b/inc/template.php @@ -170,8 +170,9 @@ function tpl_content_core() { break; default: $evt = new Doku_Event('TPL_ACT_UNKNOWN', $ACT); - if($evt->advise_before()) + if($evt->advise_before()) { msg("Failed to handle command: ".hsc($ACT), -1); + } $evt->advise_after(); unset($evt); return false; diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 4a301f927..7d2daa70d 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -70,7 +70,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin { * @param int $state The lexer state for the match * @param int $pos The character position of the matched text * @param Doku_Handler $handler The Doku_Handler object - * @return array Return an array with all data you want to use in render + * @return bool|array Return an array with all data you want to use in render, false don't add an instruction */ function handle($match, $state, $pos, Doku_Handler $handler){ trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING); @@ -97,7 +97,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin { * @param $format string output format being rendered * @param $renderer Doku_Renderer the current renderer object * @param $data array data created by handler() - * @return boolean rendered correctly? + * @return boolean rendered correctly? (however, returned value is not used at the moment) */ function render($format, Doku_Renderer $renderer, $data) { trigger_error('render() not implemented in '.get_class($this), E_USER_WARNING); |