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

Fixes bug 383, inserting macro parameters with quotes fails in macrocontainer

Browse Source
This commit is contained in:
Michael Wulff Nielsen
2012-11-20 09:29:38 -01:00
parent 68fc833280
commit 72ef5b01d2
7 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/ObjectResolution/MacroFieldEditorsResolver.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Web;
using System.Web.UI;
using Umbraco.Core.Macros;
using umbraco.interfaces;
@@ -47,7 +48,7 @@ namespace Umbraco.Core.ObjectResolution
/// </remarks>
internal string GetValueFromMacroControl(Control macroControl)
{
return ((IMacroGuiRendering)macroControl).Value;
return HttpUtility.HtmlDecode(((IMacroGuiRendering)macroControl).Value);
}
/// <remarks>
@@ -74,7 +75,7 @@ namespace Umbraco.Core.ObjectResolution
{
if (!string.IsNullOrEmpty(prop.Value))
{
instance.Value = prop.Value;
instance.Value = HttpUtility.HtmlDecode(prop.Value);
}
var macroControl = instance as Control;
if (macroControl != null)