Merged changes from stable

diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
index 2647f92c8f5cf8492b21bd06b0b1fae4427eb4db..b67a5a174c7507302f10621d0f9d4946a3dc5d99 100644 (file)
--- a/auth/shibboleth/auth.php
+++ b/auth/shibboleth/auth.php
@@ -87,7 +87,12 @@ class auth_plugin_shibboleth extends auth_plugin_base {
         $search_attribs = array();
 
         foreach ($attrmap as $key=>$value) {
-            
+          // Check if attribute is present  
+         if (!isset($_SERVER[$value])){
+               $result[$key] = '';
+               continue;
+          }
+
             // Make usename lowercase
             if ($key == 'username'){
                 $result[$key] = strtolower($this->get_first_string($_SERVER[$value]));
@@ -224,4 +229,4 @@ class auth_plugin_shibboleth extends auth_plugin_base {
     }
 }
 
-?>
\ No newline at end of file
+?>