Permalink
Browse files

Merge branch 'MDL-31629-MOODLE_22_STABLE' of git://github.com/micaher…

…ne/moodle into MOODLE_22_STABLE
  • Loading branch information...
2 parents 9cbc519 + 8c26d6d commit 3e8532dadcb8d04ca8cbc73cda13abb6a9d1584a Sam Hemelryk committed Nov 5, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 auth/shibboleth/index.php
@@ -25,7 +25,7 @@
// Check whether Shibboleth is configured properly
if (empty($pluginconfig->user_attribute)) {
- print_error('shib_not_set_up_error', 'auth');
+ print_error('shib_not_set_up_error', 'auth_shibboleth');
}
/// If we can find the Shibboleth attribute, save it in session and return to main login page
@@ -91,9 +91,9 @@
// If we can find any (user independent) Shibboleth attributes but no user
// attributes we probably didn't receive any user attributes
elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID']) || !empty($_SERVER['Shib-Application-ID'])) {
- print_error('shib_no_attributes_error', 'auth' , '', '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\'');
+ print_error('shib_no_attributes_error', 'auth_shibboleth' , '', '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\'');
} else {
- print_error('shib_not_set_up_error', 'auth');
+ print_error('shib_not_set_up_error', 'auth_shibboleth');
}

0 comments on commit 3e8532d

Please sign in to comment.