yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual merging

Browse Source
This commit is contained in:
Shannon
2018-10-22 17:04:58 +11:00
parent cd2cf26274
commit 93a52432cf
7 changed files with 118 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
View File

@@ -981,7 +981,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
temp.Content.Template = template;
if (temp.Template2Id.HasValue && templates.TryGetValue(temp.Template2Id.Value, out template))
temp.Content.PublishTemplate = template;
temp.Content.Properties = properties[temp.VersionId];
if (properties.ContainsKey(temp.VersionId))
temp.Content.Properties = properties[temp.VersionId];
else
throw new InvalidOperationException($"No property data found for version: '{cc.Version}'.");
// reset dirty initial properties (U4-1946)
temp.Content.ResetDirtyProperties(false);