Merge remote-tracking branch 'origin/v8/8.18' into v8/8.18

umbraco · Feb 27, 2024 · fa4fe47 · fa4fe47
2 parents ec52b54 + 241a0d8
commit fa4fe47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Umbraco.Core/Logging/Viewer/LogViewerSourceBase.cs b/src/Umbraco.Core/Logging/Viewer/LogViewerSourceBase.cs
@@ -98,7 +98,7 @@ public int GetNumberOfErrors(LogTimePeriod logTimePeriod)
         /// <returns></returns>
         public string GetLogLevel()
         {
-            var logLevel = Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>().Where(Log.Logger.IsEnabled)?.Min() ?? null;
+            var logLevel = Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>().Where(Log.Logger.IsEnabled).DefaultIfEmpty(LogEventLevel.Information)?.Min() ?? null;
             return logLevel?.ToString() ?? "";
         }
 

diff --git a/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MarkdownPropertyEditor.cs
@@ -1,4 +1,6 @@
-using Umbraco.Core;
+using System;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Security;
@@ -19,6 +21,13 @@ public class MarkdownPropertyEditor : DataEditor
     {
         private readonly IMarkdownSanitizer _markdownSanitizer;
 
+        [Obsolete("Use non obsolete constructor")]
+        public MarkdownPropertyEditor(ILogger logger)
+            : this(logger, Current.Factory.GetInstance<IMarkdownSanitizer>())
+        {
+
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MarkdownPropertyEditor"/> class.
         /// </summary>