From 83d0d71b9f694269dca41083629e9c37f2ab14d0 Mon Sep 17 00:00:00 2001 From: Bruno De Fraine Date: Tue, 3 Feb 2009 20:43:07 +0100 Subject: fix disable plugin mechanism revert FS#1585 Ignore-this: bd7e66b737e8847373e071f0b23d96d7 The mechanism for disabling plugins was not reverted completely: there were still references to the plugin.disabled directories in the Doku_Plugin_Controller class, this patch fixes this. darcs-hash:20090203194307-8a46b-4bb1c41e530edc9fde06ca61898a9a465d5b6d98.gz --- inc/plugincontroller.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index 372ab4f17..670dcff5d 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -76,7 +76,7 @@ class Doku_Plugin_Controller { //try to load the wanted plugin file list($plugin,$component) = $this->_splitName($name); - $dir = !$this->isdisabled($plugin) ? $plugin : $plugin.'.disabled'; + $dir = $this->get_directory($plugin); $file = $component ? "$type/$component.php" : "$type.php"; if (!include_once(DOKU_PLUGIN."$dir/$file")) { @@ -110,7 +110,7 @@ class Doku_Plugin_Controller { } function get_directory($plugin) { - return $this->isdisabled($plugin) ? $plugin.'.disabled' : $plugin; + return $plugin; } function _populateMasterList() { @@ -137,7 +137,7 @@ class Doku_Plugin_Controller { $plugins = array(); foreach ($master_list as $plugin) { - $dir = $enabled ? $plugin : $plugin.'.disabled'; + $dir = $this->get_directory($plugin); if (@file_exists(DOKU_PLUGIN."$dir/$type.php")){ $plugins[] = $plugin; -- cgit v1.2.3