From: exe-cutor <exe-cutor>
Date: Wed, 11 Jul 2007 08:30:01 +0000 (+0000)
Subject: Merged changes from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=73f1e3b28bd5468d303d81a066b53cd76f1bc96a;p=moodle.git

Merged changes from stable
---

diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
index 2647f92c8f..b67a5a174c 100644
--- 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
+?>