From cfdb1706091748a9a0c369d2aaa3abb6a463fbc6 Mon Sep 17 00:00:00 2001
From: ikawhero <ikawhero>
Date: Mon, 8 Oct 2007 06:59:00 +0000
Subject: [PATCH] Check to ensure custom profile fields do not have same name
 as current fields in the $USER record

---
 user/profile/definelib.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/user/profile/definelib.php b/user/profile/definelib.php
index 8dc42977d6..543da4937d 100644
--- a/user/profile/definelib.php
+++ b/user/profile/definelib.php
@@ -93,6 +93,8 @@ class profile_define_base {
      * @return  array    associative array of error messages
      */
     function define_validate_common($data) {
+        global $USER;
+        
         $err = array();
 
         /// Check the shortname was not truncated by cleaning
@@ -102,6 +104,10 @@ class profile_define_base {
         /// Check the shortname is unique
         } else if (($field = get_record('user_info_field', 'shortname', $data->shortname)) and ($field->id <> $data->id)) {
             $err['shortname'] = get_string('profileshortnamenotunique', 'admin');
+
+        /// Shortname must also be unique compared to the standard user fields
+        } else if (isset($USER->{$data->shortname})) {
+            $err['shortname'] = get_string('profileshortnamenotunique', 'admin');
         }
 
         /// No further checks necessary as the form class will take care of it
-- 
2.39.5