2009-02-02
defraine
>This RC reverts the mechanism for disabling plugins back to the old
>method to avoid problems with distribution packaging. It also fixes
>problems related to the login/logoff procedure.
It would seem that the mechanism for disabling plugins was not reverted completely: there are still references to the plugin.disabled directories in the Doku_Plugin_Controller class.
I made the following changes:
Index: inc/plugincontroller.class.php
===================================================================
--- inc/plugincontroller.class.php (revision 7641)
+++ inc/plugincontroller.class.php (working copy)
@@ -76,7 +76,7 @@
//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 @@
}
function get_directory($plugin) {
- return $this->isdisabled($plugin) ? $plugin.'.disabled' : $plugin;
+ return $plugin;
}
function _populateMasterList() {
@@ -137,7 +137,7 @@
$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;