summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-02-08 13:20:59 +0100
committerAndreas Gohr <andi@splitbrain.org>2013-02-08 13:20:59 +0100
commita701b283f573ba104a34ba98717e3855c6b20621 (patch)
tree9692a516f4cbbb7b5f528b40c2b3137996143919
parented2c6a71b7c05ed9ffb9031519900a6bd9e64d0a (diff)
downloadrpg-a701b283f573ba104a34ba98717e3855c6b20621.tar.gz
rpg-a701b283f573ba104a34ba98717e3855c6b20621.tar.bz2
fixed config loading for auth plugins
-rw-r--r--lib/plugins/auth.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index 42dbf1859..c14a04dfb 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -434,6 +434,7 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
if(isset($conf['auth'][$plugin])) $oldconf = (array) $conf['auth'][$plugin];
$conf['plugin'][$plugin] = array_merge($default, $oldconf, $conf['plugin'][$plugin]);
+ $this->conf =& $conf['plugin'][$plugin];
$this->configloaded = true;
}
}