From f449b8c9764a91a15cbda1130ef0cd053c48f8e8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 20 Apr 2016 12:58:32 +0100
Subject: [PATCH] removed references to 'disabled' file in plugins.local.php
---
_test/conf/plugins.local.php | 2 +-
inc/plugincontroller.class.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_test/conf/plugins.local.php b/_test/conf/plugins.local.php
index 00e8c10be..4f256a943 100644
--- a/_test/conf/plugins.local.php
+++ b/_test/conf/plugins.local.php
@@ -4,5 +4,5 @@
* Auto-generated through plugin/extension manager
*
* NOTE: Plugins will not be added to this file unless there is a need to override a default setting. Plugins are
- * enabled by default, unless having a 'disabled' file in their plugin folder.
+ * enabled by default.
*/
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 61c8811ce..5bb07531e 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -224,7 +224,7 @@ class Doku_Plugin_Controller {
$file = $this->last_local_config_file;
$out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n *\n".
" * NOTE: Plugins will not be added to this file unless there is a need to override a default setting. Plugins are\n".
- " * enabled by default, unless having a 'disabled' file in their plugin folder.\n */\n";
+ " * enabled by default.\n */\n";
foreach ($local_plugins as $plugin => $value) {
$out .= "\$plugins['$plugin'] = $value;\n";
}
--
GitLab