Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki into plugincontroller

This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The changes have been implemented by Piyush Mishra and are a part of the
new extension manager which will follow later. It's the result of a
Google Summer of Code project, the official project page can be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/piyushmishra/26001

Thanks to Piyush for the work and Google for sponsoring it!

Conflicts:
	inc/lang/en/lang.php

1 files changed, 11 insertions, 0 deletions

diff --git a/conf/plugins.protected.php b/conf/plugins.protected.php
new file mode 100644
index 000000000..26eb8888b
--- /dev/null
+++ b/conf/plugins.protected.php
@@ -0,0 +1,11 @@
+<?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;
+$plugins['usermanager'] = 1;
+$plugins['revert']      = 1;