From 19ac43c7a62405fbbe49e14b7bb54728f739a781 Mon Sep 17 00:00:00 2001
From: iarenaza <iarenaza>
Date: Fri, 15 Aug 2008 11:22:57 +0000
Subject: [PATCH] MDL-16061 Remove 'username' from the $moodleattributes array.

It doesn't make sense at all (username is not part of the externally mapped
fields) and produces a notice that breaks HTTP headers with debugging enabled.
---
 auth/cas/auth.php        | 1 -
 auth/db/auth.php         | 1 -
 auth/ldap/auth.php       | 1 -
 auth/shibboleth/auth.php | 1 -
 4 files changed, 4 deletions(-)

diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index fb42870df0..8e137eb1a4 100644
--- a/auth/cas/auth.php
+++ b/auth/cas/auth.php
@@ -500,7 +500,6 @@ if ( !is_object($PHPCAS_CLIENT) ) {
                 }
             }
         }
-        $moodleattributes['username'] = $this->config->user_attribute;
         return $moodleattributes;
     }
     /**
diff --git a/auth/db/auth.php b/auth/db/auth.php
index c0f57aff6f..ba3cf7529f 100644
--- a/auth/db/auth.php
+++ b/auth/db/auth.php
@@ -137,7 +137,6 @@ class auth_plugin_db extends auth_plugin_base {
                 $moodleattributes[$field] = $this->config->{"field_map_$field"};
             }
         }
-        $moodleattributes['username'] = $this->config->fielduser;
         return $moodleattributes;
     }
 
diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index 5e8741afe6..5a4f733891 100644
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -1612,7 +1612,6 @@ class auth_plugin_ldap extends auth_plugin_base {
                 }
             }
         }
-        $moodleattributes['username'] = $this->config->user_attribute;
         return $moodleattributes;
     }
 
diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
index 8ed938150f..84309c28a9 100644
--- a/auth/shibboleth/auth.php
+++ b/auth/shibboleth/auth.php
@@ -128,7 +128,6 @@ class auth_plugin_shibboleth extends auth_plugin_base {
                 $moodleattributes[$field] = $configarray["field_map_$field"];
             }
         }
-        $moodleattributes['username'] = $configarray["user_attribute"];
 
         return $moodleattributes;
     }
-- 
2.39.5