- Fix "key not present" exception in LocationFieldType to handle situ…

…ations where the given configurationValues are missing certain keys. (ref 1549917 AttributeEditor.cs line 2070)
SparkDevNetwork · Oct 13, 2023 · 367788a · 367788a
1 parent bc671f0
commit 367788a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Rock/Field/Types/LocationFieldType.cs b/Rock/Field/Types/LocationFieldType.cs
@@ -380,10 +380,11 @@ public override Control EditControl( Dictionary<string, ConfigurationValue> conf
             LocationPickerMode allowedPickerModes = LocationPickerMode.All;
 
             // Get the selected current picker mode, use address if there isn't one specified. This is the mode the picker will start with unless the location specifies a different location type.
-            var currentPickerMode = configurationValues[CURRENT_PICKER_MODE].Value.ConvertToEnumOrNull<LocationPickerMode>() ?? LocationPickerMode.Address;
+
+            var currentPickerMode = configurationValues.ContainsKey( CURRENT_PICKER_MODE ) ? configurationValues[CURRENT_PICKER_MODE].Value.ConvertToEnumOrNull<LocationPickerMode>() ?? LocationPickerMode.Address : LocationPickerMode.Address;
 
             string[] allowedPickerModesConfig = null;
-            if ( configurationValues[ALLOWED_PICKER_MODES].Value.IsNotNullOrWhiteSpace() )
+            if ( configurationValues.ContainsKey(ALLOWED_PICKER_MODES) && configurationValues[ALLOWED_PICKER_MODES].Value.IsNotNullOrWhiteSpace() )
             {
                 allowedPickerModesConfig = configurationValues[ALLOWED_PICKER_MODES].Value.Split( ',' );
             }