summaryrefslogtreecommitdiff
path: root/inc/config_cascade.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2011-11-27 10:50:03 +0100
committerAndreas Gohr <andi@splitbrain.org>2011-11-27 10:50:03 +0100
commit560f6ea3cdac2767863c3be3a9e7933b6e37e88f (patch)
tree6f51d4b3402458e4de1a596b93ec752c8ac747b2 /inc/config_cascade.php
parente0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a (diff)
parentc66c7229a0dfc4f9f06dadda98408679fa7a18d6 (diff)
downloadrpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.gz
rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.bz2
Merge branch 'master' into bcrypt
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