From a46d0d658b98649869f6c9660e168af3940d7c30 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 30 Jul 2005 23:51:56 +0200 Subject: Changed pluginloading to use references This patch allows the use of $this in syntax plugins to set internal variables and let them remain between handle and render calls. Even when it is possible now to use this method you should exchange data betwenn handler and render calls by using the $data array only. darcs-hash:20050730215156-7ad00-69ea79859360d9902533633395de3e1b677f6e46.gz --- inc/parser/handler.php | 4 ++-- inc/parser/xhtml.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'inc/parser') diff --git a/inc/parser/handler.php b/inc/parser/handler.php index ded291356..55cbcf342 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -66,8 +66,8 @@ class Doku_Handler { */ function plugin($match, $state, $pos, $pluginname){ $data = array($match); - $plugin = null; - if(plugin_load('syntax',$pluginname,$plugin)){ + $plugin =& plugin_load('syntax',$pluginname); + if($plugin != null){ $data = $plugin->handle($match, $state, $pos, $this); } $this->_addCall('plugin',array($pluginname,$data,$pos),$pos); diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 2fd5844d0..7dd1b8034 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -86,8 +86,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer { //handles plugin rendering function plugin($name,$data){ - $plugin = null; - if(plugin_load('syntax',$name,$plugin)){ + $plugin =& plugin_load('syntax',$name); + if($plugin != null){ $plugin->render('xhtml',$this,$data); } } -- cgit v1.2.3