From b9e72a2d8293ca308497ad9ddefef63c3c11d7d1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@umbraco.dk>
Date: Thu, 25 Apr 2024 12:56:46 +0200
Subject: [PATCH] RTE media folder config is stored as a GUID in V14 (#16138)

---
 src/Umbraco.Core/PropertyEditors/RichTextConfiguration.cs      | 2 +-
 .../PropertyEditors/RichTextPropertyEditor.cs                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Core/PropertyEditors/RichTextConfiguration.cs
index c6dbf4bd06..a0c76b1ffd 100644
--- a/src/Umbraco.Core/PropertyEditors/RichTextConfiguration.cs
+++ b/src/Umbraco.Core/PropertyEditors/RichTextConfiguration.cs
@@ -9,7 +9,7 @@ public class RichTextConfiguration : IIgnoreUserStartNodesConfig
     public RichTextBlockConfiguration[]? Blocks { get; set; } = null!;
 
     [ConfigurationField("mediaParentId")]
-    public GuidUdi? MediaParentId { get; set; }
+    public Guid? MediaParentId { get; set; }
 
     [ConfigurationField(Constants.DataTypes.ReservedPreValueKeys.IgnoreUserStartNodes)]
     public bool IgnoreUserStartNodes { get; set; }
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
index 85b60fcad6..de69f23f8e 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
@@ -214,8 +214,7 @@ public class RichTextPropertyEditor : DataEditor
                           Constants.Security.SuperUserKey;
 
             var config = editorValue.DataTypeConfiguration as RichTextConfiguration;
-            GuidUdi? mediaParent = config?.MediaParentId;
-            Guid mediaParentId = mediaParent == null ? Guid.Empty : mediaParent.Guid;
+            Guid mediaParentId = config?.MediaParentId ?? Guid.Empty;
 
             if (string.IsNullOrWhiteSpace(richTextEditorValue.Markup))
             {