- Fix null reference exception in GroupRegistration block and ensure …

…comparison is against Perosn.NickName not just Person.FirstName
SparkDevNetwork · Oct 3, 2018 · d6dbdd7 · d6dbdd7
1 parent 23fe1fb
commit d6dbdd7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/RockWeb/Blocks/Groups/GroupRegistration.ascx.cs b/RockWeb/Blocks/Groups/GroupRegistration.ascx.cs
@@ -1,4 +1,4 @@
-// <copyright>
+// <copyright>
 // Copyright by the Spark Development Network
 //
 // Licensed under the Rock Community License (the "License");
@@ -189,8 +189,8 @@ protected void btnRegister_Click( object sender, EventArgs e )
                 // Only use current person if the name entered matches the current person's name and autofill mode is true
                 if ( _autoFill )
                 {
-                    if ( CurrentPerson != null &&
-                        tbFirstName.Text.Trim().Equals( CurrentPerson.FirstName.Trim(), StringComparison.OrdinalIgnoreCase ) &&
+                    if ( CurrentPerson != null && CurrentPerson.NickName.IsNotNullOrWhiteSpace() && CurrentPerson.LastName.IsNotNullOrWhiteSpace() &&
+                        tbFirstName.Text.Trim().Equals( CurrentPerson.NickName.Trim(), StringComparison.OrdinalIgnoreCase ) &&
                         tbLastName.Text.Trim().Equals( CurrentPerson.LastName.Trim(), StringComparison.OrdinalIgnoreCase ) )
                     {
                         person = personService.Get( CurrentPerson.Id );
@@ -305,7 +305,7 @@ protected void btnRegister_Click( object sender, EventArgs e )
                     }
 
                     // Check for the spouse
-                    if ( IsFullWithSpouse && !string.IsNullOrWhiteSpace(tbSpouseFirstName.Text) && !string.IsNullOrWhiteSpace(tbSpouseLastName.Text) )
+                    if ( IsFullWithSpouse && tbSpouseFirstName.Text.IsNotNullOrWhiteSpace() && tbSpouseLastName.Text.IsNotNullOrWhiteSpace() )
                     {
                         spouse = person.GetSpouse( rockContext );
                         bool isSpouseMatch = true;