From 6d58f7821f530c90900d3cda301f9e22026c5fcb Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 3 Oct 2010 15:33:32 +0100 Subject: No need for a self include ;) --- inc/parser/renderer.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc/parser/renderer.php') diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 7e52cfce2..81c33fe62 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -6,7 +6,6 @@ * @author Andreas Gohr */ if(!defined('DOKU_INC')) die('meh.'); -require_once DOKU_INC . 'inc/parser/renderer.php'; require_once DOKU_INC . 'inc/plugin.php'; require_once DOKU_INC . 'inc/pluginutils.php'; -- cgit v1.2.3 From c2122b83f7b1516bad0b5be5d9c617cffcec8f9d Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 3 Oct 2010 16:44:58 +0100 Subject: FS#1995, add a little defense to avoid warnings caused by bad wiki syntax --- inc/parser/renderer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'inc/parser/renderer.php') diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 81c33fe62..b54ccf050 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -74,7 +74,9 @@ class Doku_Renderer extends DokuWiki_Plugin { foreach ( $instructions as $instruction ) { // execute the callback against ourself - call_user_func_array(array(&$this, $instruction[0]),$instruction[1]); + if (method_exists($this,$instruction[0])) { + call_user_func_array(array($this, $instruction[0]),$instruction[1]); + } } } -- cgit v1.2.3