From 6eb738e0d37b6048a9a2f940dd1ef0440a41e47d Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Mon, 10 Jan 2011 13:33:55 -0100
Subject: [PATCH] Fixes issue with SQL CE and loading macros on front end: Work
 Items: 29781

---
 umbraco/presentation/macro.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/umbraco/presentation/macro.cs b/umbraco/presentation/macro.cs
index 7211c3633d..2cb4f39d96 100644
--- a/umbraco/presentation/macro.cs
+++ b/umbraco/presentation/macro.cs
@@ -172,10 +172,11 @@ namespace umbraco
                             "select * from cmsMacro left join cmsMacroProperty property on property.macro = cmsMacro.id left join cmsMacroPropertyType editPropertyType on editPropertyType.id = property.macroPropertyType where cmsMacro.id = @macroID order by property.macroPropertySortOrder",
                             SqlHelper.CreateParameter("@macroID", id)))
                 {
-                    if (!macroDef.HasRecords)
+                    bool hasRows = macroDef.Read();
+                    if (!hasRows)
                         HttpContext.Current.Trace.Warn("Macro", "No definition found for id " + id);
 
-                    while (macroDef.Read())
+                    while (hasRows)
                     {
                         string tmpStr;
                         bool tmpBool;
@@ -218,6 +219,7 @@ namespace umbraco
                                 !propertyDefinitions.ContainsKey(tmpStr))
                                 propertyDefinitions.Add(tmpStr, baseType);
                         }
+                        hasRows = macroDef.Read();
                     }
                 }
                 // add current macro-object to cache