From b838050e5828b5cbf32b9e82ce11c9cc54592809 Mon Sep 17 00:00:00 2001
From: Piyush Mishra <me@piyushmishra.com>
Date: Sat, 20 Aug 2011 19:11:52 +0530
Subject: added new plugins config cascade and added plugin.info.txt

---
 conf/plugins.protected.php | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 conf/plugins.protected.php

(limited to 'conf')

diff --git a/conf/plugins.protected.php b/conf/plugins.protected.php
new file mode 100644
index 000000000..bdfe821c5
--- /dev/null
+++ b/conf/plugins.protected.php
@@ -0,0 +1,6 @@
+<?php
+$plugins['acl']         = 1;
+$plugins['plugin']      = 1;
+$plugins['config']      = 1;
+$plugins['usermanager'] = 1;
+$plugins['revert']      = 1;
-- 
cgit v1.2.3


From 98aafb569ee3413b93cd9c25844b6494d6490693 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 10:59:10 +0200
Subject: Code cleanup documentation before merge

Function get_plugin_components() moved to extantion manager
---
 conf/plugins.protected.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'conf')

diff --git a/conf/plugins.protected.php b/conf/plugins.protected.php
index bdfe821c5..26eb8888b 100644
--- a/conf/plugins.protected.php
+++ b/conf/plugins.protected.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file configures the enabled/disabled status of plugins, which are also protected
+ * from changes by the extention manager. These settings will override any local settings.
+ * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades.
+ */
 $plugins['acl']         = 1;
 $plugins['plugin']      = 1;
 $plugins['config']      = 1;
-- 
cgit v1.2.3