Fixes merge

2014-07-24 14:50:06 -07:00
parent 7d7fa0e389
commit d07ba12e73
1 changed files with 1 additions and 1 deletions
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
    {
        public override bool IsConverter(PublishedPropertyType propertyType)
        {
-            return Guid.Parse(Constants.PropertyEditors.MacroContainer).Equals(propertyType.PropertyEditorGuid);
+            return propertyType.PropertyEditorAlias == Constants.PropertyEditors.MacroContainerAlias;
        }

        // NOT thread-safe over a request because it modifies the