Re-fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3)

src/Umbraco.Core/Models/UmbracoEntity.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Models
@@ -47,13 +48,11 @@ namespace Umbraco.Core.Models
         public UmbracoEntity()
         {
             AdditionalData = new Dictionary<string, object>();
-            UmbracoProperties = new List<UmbracoProperty>();
         }
 
         public UmbracoEntity(bool trashed)
         {
             AdditionalData = new Dictionary<string, object>();
-            UmbracoProperties = new List<UmbracoProperty>();
             Trashed = trashed;
         }
 
@@ -61,7 +60,6 @@ namespace Umbraco.Core.Models
         public UmbracoEntity(UInt64 trashed)
         {
             AdditionalData = new Dictionary<string, object>();
-            UmbracoProperties = new List<UmbracoProperty>();
             Trashed = trashed == 1;
         }
 
@@ -287,15 +285,31 @@ namespace Umbraco.Core.Models
             }
         }
 
+        public override object DeepClone()
+        {
+            var clone = (UmbracoEntity) base.DeepClone();
+
+            //This ensures that any value in the dictionary that is deep cloneable is cloned too
+            foreach (var key in clone.AdditionalData.Keys.ToArray())
+            {
+                var deepCloneable = clone.AdditionalData[key] as IDeepCloneable;
+                if (deepCloneable != null)
+                {
+                    clone.AdditionalData[key] = deepCloneable.DeepClone();
+                }
+            }
+
+            return clone;
+        }
+
         /// <summary>
-        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// A struction that can be contained in the additional data of an UmbracoEntity representing 
+        /// a user defined property
         /// </summary>
-        public IList<UmbracoProperty> UmbracoProperties { get; set; }
-        
-        internal class UmbracoProperty : IDeepCloneable
+        public class EntityProperty : IDeepCloneable
         {
             public string PropertyEditorAlias { get; set; }
-            public string Value { get; set; }
+            public object Value { get; set; }
             public object DeepClone()
             {
                 //Memberwise clone on Entity will work since it doesn't have any deep elements
@@ -304,7 +318,7 @@ namespace Umbraco.Core.Models
                 return clone;
             }
 
-            protected bool Equals(UmbracoProperty other)
+            protected bool Equals(EntityProperty other)
             {
                 return PropertyEditorAlias.Equals(other.PropertyEditorAlias) && string.Equals(Value, other.Value);
             }
@@ -314,7 +328,7 @@ namespace Umbraco.Core.Models
                 if (ReferenceEquals(null, obj)) return false;
                 if (ReferenceEquals(this, obj)) return true;
                 if (obj.GetType() != this.GetType()) return false;
-                return Equals((UmbracoProperty) obj);
+                return Equals((EntityProperty) obj);
             }
 
             public override int GetHashCode()