diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
| commit | 8491e52805a9aaef90168f1417c6e0806fb7c5d7 (patch) | |
| tree | 536ad50878f0ac6f6815db91f8bcb4819bc092ae /inc/parserutils.php | |
| parent | 6fdd11e032b654dd27de346f7e54231ee043d7ef (diff) | |
| parent | dfaf5f6c54597f81b1a8b777f55b89c93f87a345 (diff) | |
| download | rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.gz rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into extension_manager
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); |