diff options
author | Andreas Gohr <andi@splitbrain.org> | 2013-10-20 11:30:51 -0700 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2013-10-20 11:30:51 -0700 |
commit | d9529222b05d3366179c8a5bbd6d717664b98de0 (patch) | |
tree | 7789b8bc9ee9405f0ce33ff19dad5d15fb9b6207 /inc/parserutils.php | |
parent | 9f5b9cf15569babaa90f0d6f3dd58cefd5439bc5 (diff) | |
parent | e07886c01389351f28a254ef6f7c9611453508fb (diff) | |
download | rpg-d9529222b05d3366179c8a5bbd6d717664b98de0.tar.gz rpg-d9529222b05d3366179c8a5bbd6d717664b98de0.tar.bz2 |
Merge pull request #380 from splitbrain/phpstrict
Php strict
Diffstat (limited to 'inc/parserutils.php')
-rw-r--r-- | inc/parserutils.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php index 56161af44..b67daaabb 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -625,7 +625,8 @@ function & p_get_renderer($mode) { $rclass = "Doku_Renderer_$rname"; if( class_exists($rclass) ) { - return new $rclass(); + $Renderer = new $rclass(); + return $Renderer; } // try default renderer first: @@ -641,10 +642,7 @@ function & p_get_renderer($mode) { $Renderer = new $rclass(); }else{ // Maybe a plugin/component is available? - list($plugin, $component) = $plugin_controller->_splitName($rname); - if (!$plugin_controller->isdisabled($plugin)){ - $Renderer =& $plugin_controller->load('renderer',$rname); - } + $Renderer = $plugin_controller->load('renderer',$rname); if(!isset($Renderer) || is_null($Renderer)){ msg("No renderer '$rname' found for mode '$mode'",-1); |