summaryrefslogtreecommitdiff
path: root/inc/config_cascade.php
diff options
context:
space:
mode:
authorlupo49 <post@lupo49.de>2011-11-12 16:22:44 +0100
committerlupo49 <post@lupo49.de>2011-11-12 16:22:44 +0100
commitfe9851b94f1bfe4014cf48043b4609def611a3ee (patch)
tree2362c48e0526f2254bb80a70db107b3032736a80 /inc/config_cascade.php
parent1614eb9180008daaf518e6271b82222219efc008 (diff)
parent2c961e6163b23ef3f1d93b1b0c23b214f3aeb358 (diff)
downloadrpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.gz
rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.bz2
Merge remote branch 'upstream/master'
Diffstat (limited to 'inc/config_cascade.php')
-rw-r--r--inc/config_cascade.php5
1 files changed, 4 insertions, 1 deletions
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