From 32eaf72e4a7a2a408cdd878020ecf9164866d82c Mon Sep 17 00:00:00 2001 From: Suha Can Date: Mon, 29 Nov 2010 12:04:03 -0800 Subject: [PATCH] PERF: Manually merging a condition in CommonPartHandler::ContentTypeWithACommonPart --HG-- branch : perf --- .../Core/Common/Handlers/CommonPartHandler.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs index c012a3ddb..0c939952f 100644 --- a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs @@ -1,7 +1,6 @@ using System.Linq; using JetBrains.Annotations; using Orchard.ContentManagement.MetaData; -using Orchard.ContentManagement.MetaData.Models; using Orchard.Core.Common.Models; using Orchard.Data; using Orchard.Localization; @@ -67,9 +66,11 @@ namespace Orchard.Core.Common.Handlers { bool ContentTypeWithACommonPart(string typeName) { //Note: What about content type handlers which activate "CommonPart" in code? var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(typeName); - if (contentTypeDefinition == null) - return false; - return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart"); + + if (contentTypeDefinition != null) + return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart"); + + return false; } void AssignCreatingOwner(InitializingContentContext context, CommonPart part) {