Merge pull request #5536 from valadas/replay-pr5535

Fixed an issue where the html editor browser would fail
dnnsoftware · Feb 8, 2023 · b52ff1d · b52ff1d
2 parents 683ba7d + 04cef3c
commit b52ff1d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Utilities/SettingsUtil.cs b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/Utilities/SettingsUtil.cs
@@ -176,7 +176,7 @@ internal static EditorProviderSettings LoadEditorSettingsByKey(
                             typeof(CodeMirror).GetProperties()
                                 .Where(codeMirrorInfo => !codeMirrorInfo.Name.Equals("Theme")))
                         {
-                            settingValue = filteredSettings.FirstOrDefault(setting => setting.Name.Equals(string.Format("{0}{1}", key, codeMirrorInfo.Name))).Value;
+                            settingValue = filteredSettings.FirstOrDefault(setting => setting.Name.Equals(string.Format("{0}{1}", key, codeMirrorInfo.Name)))?.Value;
                             switch (codeMirrorInfo.PropertyType.Name)
                             {
                                 case "String":
@@ -207,7 +207,7 @@ internal static EditorProviderSettings LoadEditorSettingsByKey(
                     case "WordCount":
                         foreach (var wordCountInfo in typeof(WordCountConfig).GetProperties())
                         {
-                            settingValue = filteredSettings.FirstOrDefault(setting => setting.Name.Equals(string.Format("{0}{1}", key, wordCountInfo.Name))).Value;
+                            settingValue = filteredSettings.FirstOrDefault(setting => setting.Name.Equals(string.Format("{0}{1}", key, wordCountInfo.Name)))?.Value;
                             switch (wordCountInfo.PropertyType.Name)
                             {
                                 case "String":