From 3b7c8d73deef6dfb2aefe93e9f5f26a08407099b Mon Sep 17 00:00:00 2001
From: sgay <unknown@kiln.example.com>
Date: Thu, 20 Jan 2011 13:47:46 -0100
Subject: [PATCH] fix #29470 - macros rendered twice

---
 umbraco/presentation/macro.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/umbraco/presentation/macro.cs b/umbraco/presentation/macro.cs
index 3c714a13be..73b89e7247 100644
--- a/umbraco/presentation/macro.cs
+++ b/umbraco/presentation/macro.cs
@@ -487,6 +487,11 @@ namespace umbraco
                                                   TimeSpan.Zero,
                                                   CacheItemPriority.Low,
                                                   null);
+
+                                // zb-00003 #29470 : replace by text if not already text
+								// otherwise it is rendered twice
+                                if (!(macroControl is LiteralControl))
+                                    macroControl = new LiteralControl(sw.ToString());
                             }
                         }
                     }