diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-08-03 00:40:34 +0200 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-08-03 00:40:34 +0200 |
| commit | b8b64ed77285e4d753d35d4ceab0516be597a2f1 (patch) | |
| tree | 7cc1a82a5887a9efeb3f9160f98613e65e404ba0 /inc/plugin.php | |
| parent | af07997c5ff7cc096965159d90158e3710d2d019 (diff) | |
| parent | 586da9c1028b1013e8dc47911ba430671a389b5b (diff) | |
| download | rpg-b8b64ed77285e4d753d35d4ceab0516be597a2f1.tar.gz rpg-b8b64ed77285e4d753d35d4ceab0516be597a2f1.tar.bz2 | |
Merge branch 'master' into configmgr_improvements
Diffstat (limited to 'inc/plugin.php')
| -rw-r--r-- | inc/plugin.php | 6 |
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; } |