Merge pull request #3550 from SCullman/FixDisplayName

Fix for DisplayUserName
dnnsoftware · Feb 18, 2020 · 0d44782 · 0d44782
2 parents c768c5a + 5f628b5
commit 0d44782
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/DNN Platform/Website/DesktopModules/Admin/Security/Register.ascx.cs b/DNN Platform/Website/DesktopModules/Admin/Security/Register.ascx.cs
@@ -591,12 +591,14 @@ private bool Validate()
                 {
                     CreateStatus = UserCreateStatus.InvalidLastName;
                 }
-
-                var cleanDisplayName = PortalSecurity.Instance.InputFilter(User.DisplayName, filterFlags);
-                if (!cleanDisplayName.Equals(User.DisplayName))
-                {
-                    CreateStatus = UserCreateStatus.InvalidDisplayName;
-                }
+				if (string.IsNullOrEmpty(PortalSettings.Registration.DisplayNameFormat))
+				{
+					var cleanDisplayName = PortalSecurity.Instance.InputFilter(User.DisplayName, filterFlags);
+					if (!cleanDisplayName.Equals(User.DisplayName))
+					{
+						CreateStatus = UserCreateStatus.InvalidDisplayName;
+					}
+				}
             }
 
             if (PortalSettings.Registration.RegistrationFormType == 0)