From d5cb4112b5945c04355785fa53b1941413f097c6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 3 Jul 2014 12:46:08 +0000 Subject: [PATCH] * Setup: fixed fatal error "Cannot redeclare auth_type()", when there is a validation error on saving configuration --- setup/inc/hook_config.inc.php | 2 +- setup/templates/default/config.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php index 0c9599dda5..6bc2912a04 100644 --- a/setup/inc/hook_config.inc.php +++ b/setup/inc/hook_config.inc.php @@ -168,7 +168,7 @@ function sql_passwdhashes($config, $return_hashes=false, &$securest=null) * @param array $config * @return string */ -function auth_type($config) +function auth_types($config) { return _options_from(setup_cmd_config::auth_types(),$config['auth_type']); } diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl index 4cf7242e3b..389349ce96 100644 --- a/setup/templates/default/config.tpl +++ b/setup/templates/default/config.tpl @@ -127,7 +127,7 @@ {lang_Select_which_type_of_authentication_you_are_using}: