summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/actions.php2
-rw-r--r--inc/cache.php2
-rw-r--r--inc/parser/handler.php1
-rw-r--r--inc/template.php3
4 files changed, 5 insertions, 3 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;