From: Adrian Greeve <abgreeve@gmail.com>
Date: Wed, 1 May 2019 06:30:00 +0000 (+0800)
Subject: Merge branch 'MDL-64959_master' of https://github.com/abhimanyuZ/moodle
X-Git-Tag: v3.7.0-beta~103
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=53c792b1192c2f2514e581a2472b58e1f7528442;hp=1ba1bb79e821ada5c7e55716f31b613b9a31e847

Merge branch 'MDL-64959_master' of https://github.com/abhimanyuZ/moodle
---

diff --git a/admin/tool/uploaduser/locallib.php b/admin/tool/uploaduser/locallib.php
index ae3dfe38880..f6eeccecc98 100644
--- a/admin/tool/uploaduser/locallib.php
+++ b/admin/tool/uploaduser/locallib.php
@@ -183,6 +183,7 @@ function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $pr
     $processed = array();
     foreach ($columns as $key=>$unused) {
         $field = $columns[$key];
+        $field = trim($field);
         $lcfield = core_text::strtolower($field);
         if (in_array($field, $stdfields) or in_array($lcfield, $stdfields)) {
             // standard fields are only lowercase