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.

diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index fb42870df0bbfab0480d7eae6867e5e40491a6d6..8e137eb1a4b50a64a521ff05d5a95b03c96bb460 100644 (file)
--- 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 c0f57aff6fa1dc4393289b31676c7aba7d39db9c..ba3cf7529f7f2f75390e682633a232b738e1ec29 100644 (file)
--- 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 5e8741afe6503eb247a18074d4fb0bd36860a379..5a4f733891c9d06c54404b09fbab48530e968df7 100644 (file)
--- 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 8ed938150fe083579cc828efb9cef70b215f91f4..84309c28a9c7d6ce0ab89a2f918726bd7fca3151 100644 (file)
--- 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;
     }