diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php index 036cb0d77531adec6e4511cb4ccb56b34bc2be88..0cd965b72e9b8b1a926ac6c0994fba6b3de07904 100644 --- a/lib/plugins/auth.php +++ b/lib/plugins/auth.php @@ -435,23 +435,4 @@ 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(); - $oldname = preg_replace('/^auth/', '', $plugin); - - $default = $this->readDefaultSettings(); - $oldconf = array(); - if(isset($conf['auth'][$oldname])) $oldconf = (array) $conf['auth'][$oldname]; - $conf['plugin'][$plugin] = array_merge($default, $oldconf, (array) $conf['plugin'][$plugin]); - - $this->conf =& $conf['plugin'][$plugin]; - $this->configloaded = true; - } }