Merge pull request #2565 from leekelleher/U4-9088

U4-9088 - Macro Container Property Type returned incorrect object-type
This commit is contained in:
Sebastiaan Janssen
2018-06-28 20:33:50 +02:00
committed by GitHub

View File

@@ -12,7 +12,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
/// Ensures macro syntax is parsed for the macro container which will work when getting the field
/// values in any way (i.e. dynamically, using Field(), or IPublishedContent)
/// </summary>
[PropertyValueType(typeof (IHtmlString))]
[PropertyValueType(typeof(IHtmlString))]
[PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Request)]
[DefaultPropertyValueConverter]
public class MacroContainerValueConverter : PropertyValueConverterBase
@@ -64,7 +64,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
// ensure string is parsed for macros and macros are executed correctly
sourceString = RenderMacros(sourceString, preview);
return sourceString;
return new HtmlString(sourceString);
}
}
}
}