Merge branch 'w07_MDL-26376_20_shib' of git://github.com/skodak/moodle

moodle · Feb 14, 2011 · 2e6bd88 · 2e6bd88
2 parents 42bdecd + cd138b2
commit 2e6bd88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
@@ -242,7 +242,7 @@ function process_config($config) {
 
         // 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');
+            $config->auth_instructions = get_string('auth_shib_instructions', 'auth_shibboleth', $CFG->wwwroot.'/auth/shibboleth/index.php');
         }
         if (!isset ($config->user_attribute)) {
             $config->user_attribute = '';
@@ -292,7 +292,7 @@ function process_config($config) {
         } else {
             // Check if integrated WAYF was enabled and is now turned off
             // If it was and only then, reset the Moodle alternate URL
-            if ($this->config->alt_login == 'on'){
+            if (isset($this->config->alt_login) and $this->config->alt_login == 'on'){
                 set_config('alt_login',    'off',    'auth/shibboleth');
                 set_config('alternateloginurl', '');
             }