Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle

moodle · Jul 28, 2014 · 9834bce · 9834bce
2 parents 8d4da7c + 1b28d1a
commit 9834bce
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/user/filters/lib.php b/user/filters/lib.php
@@ -63,10 +63,10 @@ public function user_filtering($fieldnames = null, $baseurl = null, $extraparams
         }
 
         if (empty($fieldnames)) {
-            $fieldnames = array('realname' => 0, 'lastname' => 1, 'firstname' => 1, 'email' => 1, 'city' => 1, 'country' => 1,
+            $fieldnames = array('realname' => 0, 'lastname' => 1, 'firstname' => 1, 'username' => 1, 'email' => 1, 'city' => 1, 'country' => 1,
                                 'confirmed' => 1, 'suspended' => 1, 'profile' => 1, 'courserole' => 1, 'systemrole' => 1,
                                 'cohort' => 1, 'firstaccess' => 1, 'lastaccess' => 1, 'neveraccessed' => 1, 'timemodified' => 1,
-                                'nevermodified' => 1, 'username' => 1, 'auth' => 1, 'mnethostid' => 1);
+                                'nevermodified' => 1, 'auth' => 1, 'mnethostid' => 1);
         }
 
         $this->_fields  = array();