From 4d390d4260c028ff110151e305e93b80f3eb13eb Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Nov 2012 14:00:14 +0100
Subject: [PATCH] don't merge any global confs into auth plugin configs
---
lib/plugins/auth.php | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index 4c3c585cf..cd2f9ac12 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'];
- }
}
--
GitLab