Skip to content
Snippets Groups Projects
Commit 4d390d42 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

don't merge any global confs into auth plugin configs

parent 383dc989
No related branches found
No related tags found
No related merge requests found
......@@ -416,21 +416,4 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
global $conf;
return ($_SESSION[DOKU_COOKIE]['auth']['time'] >= @filemtime($conf['cachedir'].'/sessionpurge'));
}
/**
* loadConfig()
* merges the plugin's default settings with any local settings
* this function is automatically called through getConf()
*/
function loadConfig() {
global $conf;
parent::loadConfig();
$this->conf['debug'] = $conf['debug'];
$this->conf['useacl'] = $conf['useacl'];
$this->conf['disableactions'] = $conf['disableactions'];
$this->conf['autopasswd'] = $conf['autopasswd'];
$this->conf['passcrypt'] = $conf['ssha'];
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment