diff options
| author | Matthias Schulte <post@lupo49.de> | 2011-09-11 13:11:30 +0200 |
|---|---|---|
| committer | Matthias Schulte <post@lupo49.de> | 2011-09-11 13:11:30 +0200 |
| commit | 1614eb9180008daaf518e6271b82222219efc008 (patch) | |
| tree | bd9b3138f288fbc6786f3b28c7f3d438bf79c36f /inc/config_cascade.php | |
| parent | e2b5ad84f88d0bd1fe510fa74673cc7557c6e630 (diff) | |
| parent | 29d511bfa507384ae0872f75fb54acb44b1e915e (diff) | |
| download | rpg-1614eb9180008daaf518e6271b82222219efc008.tar.gz rpg-1614eb9180008daaf518e6271b82222219efc008.tar.bz2 | |
Merge branch 'master' of http://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/config_cascade.php')
| -rw-r--r-- | inc/config_cascade.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 48ed5a000..c01778e99 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -64,6 +64,11 @@ $config_cascade = array_merge( 'plainauth.users' => array( 'default' => DOKU_CONF.'users.auth.php', ), + + 'plugins' => array( + 'local' => array(DOKU_CONF.'plugins.local.php'), + 'protected' => array(DOKU_CONF.'plugins.protected.php'), + ), ), $config_cascade ); |