summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2011-11-06 06:10:12 -0800
committerAnika Henke <anika@selfthinker.org>2011-11-06 06:10:12 -0800
commit0d38901947b4969b7dd8faba2d2779525efc421e (patch)
tree0c2358bd8151c455f0424b879e6e3c94f0eebb69
parent8707b67124d73a0df1b88c2f0da037aa0fa5ba16 (diff)
parent2fb7abe3dee7d302d006ae5c112c98123914279d (diff)
downloadrpg-0d38901947b4969b7dd8faba2d2779525efc421e.tar.gz
rpg-0d38901947b4969b7dd8faba2d2779525efc421e.tar.bz2
Merge pull request #60 from piyushmishra/plugins-cascade
Changes to plugins cascade for FS#2359
-rw-r--r--conf/plugins.required.php (renamed from conf/plugins.protected.php)0
-rw-r--r--inc/config_cascade.php5
2 files changed, 4 insertions, 1 deletions
diff --git a/conf/plugins.protected.php b/conf/plugins.required.php
index 26eb8888b..26eb8888b 100644
--- a/conf/plugins.protected.php
+++ b/conf/plugins.required.php
diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index c01778e99..443114f52 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -67,7 +67,10 @@ $config_cascade = array_merge(
'plugins' => array(
'local' => array(DOKU_CONF.'plugins.local.php'),
- 'protected' => array(DOKU_CONF.'plugins.protected.php'),
+ 'protected' => array(
+ DOKU_CONF.'plugins.required.php',
+ DOKU_CONF.'plugins.protected.php',
+ ),
),
),
$config_cascade