From 1531d1efef48828d829ae3ac1e7baa9b1067df1b Mon Sep 17 00:00:00 2001 From: exe-cutor Date: Tue, 15 May 2007 08:49:54 +0000 Subject: [PATCH] Merging fixes from 1.8 stable --- auth/shibboleth/auth.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php index 54c0265ca9..f239fa5735 100644 --- a/auth/shibboleth/auth.php +++ b/auth/shibboleth/auth.php @@ -174,6 +174,8 @@ class auth_plugin_shibboleth extends auth_plugin_base { * @param object $config Configuration object */ function process_config($config) { + global $CFG; + // set to defaults if undefined if (!isset($config->auth_instructions) or empty($config->user_attribute)) { $config->auth_instructions = get_string('shibboleth_instructions', 'auth', $CFG->wwwroot.'/auth/shibboleth/index.php'); @@ -195,7 +197,8 @@ class auth_plugin_shibboleth extends auth_plugin_base { set_config('changepasswordurl', $config->changepasswordurl, 'auth/shibboleth'); // Check values and return false if something is wrong - if (!file_exists($config->convert_data) || !is_readable($config->convert_data)){ + // Patch Anyware Technologies (14/05/07) + if (($config->convert_data != '')&&(!file_exists($config->convert_data) || !is_readable($config->convert_data))){ return false; } -- 2.39.5