aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2016-04-18 23:01:01 +0200
committerGerrit Uitslag <klapinklapin@gmail.com>2016-04-18 23:01:01 +0200
commita1eba280ac2bc479d2d1f3b329702444f5974eb5 (patch)
tree89c4094dc1655680d28eb0080148ac7ba0368897
parent34edd8f7bf72cea63d7e1edfadb7258492d86d01 (diff)
downloaddokuwiki-a1eba280ac2bc479d2d1f3b329702444f5974eb5.tar.gz
dokuwiki-a1eba280ac2bc479d2d1f3b329702444f5974eb5.zip
Remove support for .disable in plugin folder
Close #1323
-rw-r--r--inc/plugincontroller.class.php12
1 files changed, 0 insertions, 12 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 8d20f885d..294ce2687 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -177,18 +177,6 @@ class Doku_Plugin_Controller {
// disabling mechanism was changed back very soon again
// to keep everything simple we just skip the plugin completely
continue;
- } 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;
- }
- $this->plugin_cascade['default'][$plugin] = 0;
-
} elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
($plugin === 'plugin' && isset($conf['pluginmanager']) && !$conf['pluginmanager'])){
$all_plugins[$plugin] = 0;