summaryrefslogtreecommitdiff
path: root/inc/plugincontroller.class.php
diff options
context:
space:
mode:
authorHakan Sandell <sandell.hakan@gmail.com>2011-09-10 18:54:23 +0200
committerHakan Sandell <sandell.hakan@gmail.com>2011-09-10 18:54:23 +0200
commitc8f071abd276c4c381eacabead655799db4a7a2f (patch)
tree27df39636b31be6d6e91236db7957598644272aa /inc/plugincontroller.class.php
parent25b1f51433d8d2643fae1754ecaf3b8ec986ffe2 (diff)
downloadrpg-c8f071abd276c4c381eacabead655799db4a7a2f.tar.gz
rpg-c8f071abd276c4c381eacabead655799db4a7a2f.tar.bz2
Added comment in conf/plugins.local about how disabled files work
Diffstat (limited to 'inc/plugincontroller.class.php')
-rw-r--r--inc/plugincontroller.class.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index aa5d0af57..cdaee2e8f 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -187,7 +187,8 @@ class Doku_Plugin_Controller {
$local_plugins = $this->rebuildLocal();
if($local_plugins != $this->plugin_cascade['local']) {
$file = $this->last_local_config_file;
- $out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n */\n";
+ $out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n".
+ " * NOTE: plugins with a 'disabled' file will not be added to this file unless they are enabled which overrides the 'disabled' file\n */\n";
foreach ($local_plugins as $plugin => $value) {
$out .= "\$plugins['$plugin'] = $value;\n";
}