summaryrefslogtreecommitdiff
path: root/inc/plugin.php
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2013-08-01 20:52:09 +0200
committerMichael Hamann <michael@content-space.de>2013-08-01 21:02:21 +0200
commit38c7b2bfd3f3a442eacfde3aa700a41cce83c460 (patch)
treedcace1b8026051730cbbe77e9da2678c23cde903 /inc/plugin.php
parent806bda372823b324cbea945421fdc17d0a6e062e (diff)
downloadrpg-38c7b2bfd3f3a442eacfde3aa700a41cce83c460.tar.gz
rpg-38c7b2bfd3f3a442eacfde3aa700a41cce83c460.tar.bz2
Fix loading for helper components with loadHelper()
The check if the plugin is enabled is done later in the plugin controller anyway.
Diffstat (limited to 'inc/plugin.php')
-rw-r--r--inc/plugin.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/inc/plugin.php b/inc/plugin.php
index 4d3d45f62..422b82534 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -199,11 +199,7 @@ class DokuWiki_Plugin {
* @return object helper plugin object
*/
function loadHelper($name, $msg = true){
- if (!plugin_isdisabled($name)){
- $obj = plugin_load('helper',$name);
- }else{
- $obj = null;
- }
+ $obj = plugin_load('helper',$name);
if (is_null($obj) && $msg) msg("Helper plugin $name is not available or invalid.",-1);
return $obj;
}