From 79f4925faf933984a4c137722ccdbd5517248ce6 Mon Sep 17 00:00:00 2001 From: agrath Date: Sun, 16 Oct 2011 09:24:14 -1300 Subject: [PATCH] Fixed a null in @Library.Wrap check that wasn't short circuiting as intended --- .../RazorDynamicNode/RazorLibraryCore.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs index 11eb36af0c..17800ce4bf 100644 --- a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs +++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs @@ -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); }