From f0258b2bce7fa79b7ff20ea2183fab28fd827f96 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 20 Feb 2014 23:14:39 +1100
Subject: [PATCH] fixes merge issue

---
 .../Persistence/Repositories/ContentTypeBaseRepository.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
index 3201213b8c..487c43b89c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
@@ -426,13 +426,13 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="propertyType"></param>
         private void AssignDataTypeFromPropertyEditor(PropertyType propertyType)
         {
-            //we cannot try to assign a data type of it's an empty guid
-            if (propertyType.DataTypeId != Guid.Empty)
+            //we cannot try to assign a data type of it's empty
+            if (propertyType.PropertyEditorAlias.IsNullOrWhiteSpace() == false)
             {
                 var sql = new Sql()
                     .Select("*")
                     .From<DataTypeDto>()
-                    .Where("controlId = @Id", new { Id = propertyType.DataTypeId })
+                    .Where("propertyEditorAlias = @propertyEditorAlias", new { propertyEditorAlias = propertyType.PropertyEditorAlias })
                     .OrderBy<DataTypeDto>(typeDto => typeDto.DataTypeId);
                 var datatype = Database.FirstOrDefault<DataTypeDto>(sql);
                 //we cannot assign a data type if one was not found
@@ -442,7 +442,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 }
                 else
                 {
-                    LogHelper.Warn<ContentTypeBaseRepository<TId, TEntity>>("Could not assign a data type for the property type " + propertyType.Alias + " since no data type was found with a property editor " + propertyType.DataTypeId);
+                    LogHelper.Warn<ContentTypeBaseRepository<TId, TEntity>>("Could not assign a data type for the property type " + propertyType.Alias + " since no data type was found with a property editor " + propertyType.PropertyEditorAlias);
                 }
             }
         }