diff options
| author | Adrian Lang <dokuwiki@adrianlang.de> | 2011-02-06 19:59:37 +0100 |
|---|---|---|
| committer | Adrian Lang <dokuwiki@adrianlang.de> | 2011-02-06 20:00:24 +0100 |
| commit | c45608df2e8efbaeb1b4c29d87b976c0e6366ad1 (patch) | |
| tree | 1c0186c56e3e71f99b3379d3f16f50ce4e0fcb08 /inc | |
| parent | b17e20ac9cca30b612968d02f06fa9c5df5c01f0 (diff) | |
| download | rpg-c45608df2e8efbaeb1b4c29d87b976c0e6366ad1.tar.gz rpg-c45608df2e8efbaeb1b4c29d87b976c0e6366ad1.tar.bz2 | |
Honor conf[pluginmanager] again (closes FS#1856)
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/plugincontroller.class.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index ad394e11f..6e361e172 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -125,6 +125,7 @@ class Doku_Plugin_Controller { } function _populateMasterList() { + global $conf; if ($dh = opendir(DOKU_PLUGIN)) { while (false !== ($plugin = readdir($dh))) { if ($plugin[0] == '.') continue; // skip hidden entries @@ -134,7 +135,9 @@ class Doku_Plugin_Controller { // the plugin was disabled by rc2009-01-26 // disabling mechanism was changed back very soon again // to keep everything simple we just skip the plugin completely - }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')){ + }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled') || + ($plugin === 'plugin' && isset($conf['pluginmanager']) && + !$conf['pluginmanager'])){ $this->list_disabled[] = $plugin; } else { $this->list_enabled[] = $plugin; |