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

Fixed a null in @Library.Wrap check that wasn't short circuiting as intended

Browse Source
This commit is contained in:
agrath
2011-10-16 09:24:14 -13:00
parent a0a2037813
commit 79f4925faf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
View File

@@ -231,7 +231,7 @@ namespace umbraco.MacroEngines.Library
public HtmlTagWrapper Wrap(string tag, object inner, object anonymousAttributes, params HtmlTagWrapperBase[] Children)
{
string innerText = null;
if (inner.GetType() != typeof(DynamicNull) && inner != null)
if (inner != null && inner.GetType() != typeof(DynamicNull))
{
innerText = string.Format("{0}", inner);
}
@@ -245,7 +245,7 @@ namespace umbraco.MacroEngines.Library
public HtmlTagWrapper Wrap(string tag, object inner)
{
string innerText = null;
if (inner.GetType() != typeof(DynamicNull) && inner != null)
if (inner != null && inner.GetType() != typeof(DynamicNull))
{
innerText = string.Format("{0}", inner);
}