Permalink
Browse files

Merging fixes from 1.8 stable

  • Loading branch information...
1 parent a242235 commit 1531d1efef48828d829ae3ac1e7baa9b1067df1b exe-cutor committed May 15, 2007
Showing with 4 additions and 1 deletion.
  1. +4 −1 auth/shibboleth/auth.php
View
@@ -174,6 +174,8 @@ function config_form($config, $err, $user_fields) {
* @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 @@ function process_config($config) {
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;
}

0 comments on commit 1531d1e

Please sign in to comment.