diff options
| -rw-r--r-- | inc/plugincontroller.class.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index a6685ca2f..2910e6de0 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -140,21 +140,20 @@ class Doku_Plugin_Controller { // 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')) { + // treat this as a default disabled plugin(over-rideable by the plugin manager) + // deprecated 2011-09-10 (usage of disabled files) if(empty($this->plugin_cascade['local'][$plugin])) $all_plugins[$plugin] = 0; else $all_plugins[$plugin] = 1; - //treat this as a default disabled plugin(over-rideable by the plugin manager) $this->plugin_cascade['default'][$plugin] = 0; - //TODO take this out before final release, - //it is here only for other developers to be able to switch branches easily - //@unlink(DOKU_PLUGIN.$plugin.'/disabled'); - continue; + } elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) || ($plugin === 'plugin' && isset($conf['pluginmanager']) && !$conf['pluginmanager'])){ $all_plugins[$plugin] = 0; + } elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) { $all_plugins[$plugin] = 1; } else { @@ -162,7 +161,6 @@ class Doku_Plugin_Controller { } } $this->tmp_plugins = $all_plugins; - $this->saveList(); } } |