From b4b0a37c2ceb383c3f5555e653047e76f56c46d7 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 31 May 2013 09:13:25 -0200
Subject: [PATCH] Fixes U4-2302 Breaking change in 6.1? Macro parameter
 "contentPicker" no longer passes an id, but a node

---
 src/Umbraco.Web/umbraco.presentation/macro.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs
index 10fa66fd65..0aa0fbfc66 100644
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -1230,8 +1230,12 @@ namespace umbraco
                     { }
                     break;
 
-                case "contentPicker":
-                    var currentNode = macroXml.ImportNode(umbracoXml.GetElementById(contentId), true);
+                case "contentCurrent":
+                    var importNode = macroPropertyValue == string.Empty
+                        ? umbracoXml.GetElementById(contentId)
+                        : umbracoXml.GetElementById(macroPropertyValue);
+
+                    var currentNode = macroXml.ImportNode(importNode, true);
 
                     // remove all sub content nodes
                     foreach (XmlNode n in currentNode.SelectNodes("node|*[@isDoc]"))