summaryrefslogtreecommitdiff
path: root/inc/config_cascade.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2011-11-12 09:56:31 +0100
committerAndreas Gohr <andi@splitbrain.org>2011-11-12 09:56:31 +0100
commit814971a656bea14615ffa2af999cdda639e046a7 (patch)
treed961196dbc52a1e0e91bf7e42dfe057c4a1a209a /inc/config_cascade.php
parent1d045709e66a239d6a0933c0d07dfbb9fb257d48 (diff)
parent2c961e6163b23ef3f1d93b1b0c23b214f3aeb358 (diff)
downloadrpg-814971a656bea14615ffa2af999cdda639e046a7.tar.gz
rpg-814971a656bea14615ffa2af999cdda639e046a7.tar.bz2
Merge branch 'master' into htmlmail
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