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

fixes merge

Browse Source
This commit is contained in:
Shannon
2019-01-16 02:18:02 +11:00
parent b34582b35c
commit d97b100bab
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Packaging/PackageDataInstallation.cs
View File

@@ -556,6 +556,10 @@ namespace Umbraco.Core.Packaging
if (isListView != null)
contentType.IsContainer = isListView.Value.InvariantEquals("true");
var isElement = infoElement.Element("IsElement");
if (isElement != null)
contentType.IsElement = isElement.Value.InvariantEquals("true");
//Name of the master corresponds to the parent and we need to ensure that the Parent Id is set
var masterElement = infoElement.Element("Master");
if (masterElement != null)

4
src/Umbraco.Core/Services/Implement/PackagingService.cs
View File

@@ -43,10 +43,6 @@ namespace Umbraco.Core.Services.Implement
ICreatedPackagesRepository createdPackages,
IInstalledPackagesRepository installedPackages,
IPackageInstallation packageInstallation)
var isElement = infoElement.Element("IsElement");
if (isListView != null)
contentType.IsElement = isElement.Value.InvariantEquals("true");
{
_auditService = auditService;
_createdPackages = createdPackages;