summaryrefslogtreecommitdiff
path: root/lib/plugins/auth.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/plugins/auth.php')
-rw-r--r--lib/plugins/auth.php17
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index cce2370d9..42dbf1859 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -419,4 +419,21 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
global $conf;
return ($_SESSION[DOKU_COOKIE]['auth']['time'] >= @filemtime($conf['cachedir'].'/sessionpurge'));
}
+
+ /**
+ * Overrides the standard config loading to integrate old auth module style configs
+ *
+ * @deprecated 2012-11-09
+ */
+ public function loadConfig(){
+ global $conf;
+ $plugin = $this->getPluginName();
+
+ $default = $this->readDefaultSettings();
+ $oldconf = array();
+ if(isset($conf['auth'][$plugin])) $oldconf = (array) $conf['auth'][$plugin];
+
+ $conf['plugin'][$plugin] = array_merge($default, $oldconf, $conf['plugin'][$plugin]);
+ $this->configloaded = true;
+ }
}