diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php index 4c3c585cf53d7a0ab900577c6766947100adfc1a..cd2f9ac12ef2bf28c9b61d44dacc530f18ef57db 100644 --- a/lib/plugins/auth.php +++ b/lib/plugins/auth.php @@ -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']; - } }