From e71b0ef705b86bb653fcae43e6845acbe6fd7fd2 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Sun, 17 Mar 2013 19:22:37 +0100
Subject: [PATCH] backward compatibility for old authtype settings
---
inc/auth.php | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/inc/auth.php b/inc/auth.php
index 68b6b438d..0713ca6af 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -48,10 +48,15 @@ function auth_setup() {
// try to load auth backend from plugins
foreach ($plugin_controller->getList('auth') as $plugin) {
- if ($conf['authtype'] === $plugin) {
- $auth = $plugin_controller->load('auth', $plugin);
- break;
- }
+ if ($conf['authtype'] === $plugin) {
+ $auth = $plugin_controller->load('auth', $plugin);
+ break;
+ } elseif ('auth' . $conf['authtype'] === $plugin) {
+ // matches old auth backends (pre-Weatherwax)
+ $auth = $plugin_controller->load('auth', $plugin);
+ msg('Your authtype setting is deprecated. You must set $conf[\'authconfig\'] = ' . "auth" . $conf['authtype']
+ . ' in your config (see <a href="https://www.dokuwiki.org/auth">Authentication Backends</a>)',-1);
+ }
}
if(!isset($auth) || !$auth){
--
GitLab