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

V8: Fix caching of macro results in RTE (#6010)

Browse Source
This commit is contained in:
stevemegson
2019-08-22 22:34:33 +01:00
committed by Sebastiaan Janssen
parent 320cc48132
commit 9b212121e3
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
View File

@@ -11,6 +11,7 @@ using Umbraco.Core.Cache;
using Umbraco.Core.Services;
using Umbraco.Web.Composing;
using Umbraco.Web.Macros;
using System.Web;
namespace Umbraco.Web.PropertyEditors.ValueConverters
{
@@ -63,7 +64,14 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
}
}
public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
{
var converted = Convert(inter, preview);
return new HtmlString(converted == null ? string.Empty : converted);
}
private string Convert(object source, bool preview)
{
if (source == null)
{