diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-08-03 10:44:54 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-08-03 10:44:54 +0200 |
| commit | 6acfab8732e1784b953c8cc2ae7408f84fda7ce8 (patch) | |
| tree | 01e6ac38df46c9ad18f058c8d597617702eb67f3 /inc/plugin.php | |
| parent | 51bd6f039e782dca456022514893aa80bd7c52b9 (diff) | |
| parent | cab505616ec9b8ef3cd671e7337c91d065745932 (diff) | |
| download | rpg-6acfab8732e1784b953c8cc2ae7408f84fda7ce8.tar.gz rpg-6acfab8732e1784b953c8cc2ae7408f84fda7ce8.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into changelogtestsonly
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; } |