Fixes U4-2302 Breaking change in 6.1? Macro parameter "contentPicker" no longer

passes an id, but a node
2013-05-31 09:13:25 -02:00
parent 8c841f97cc
commit b4b0a37c2c
1 changed files with 6 additions and 2 deletions
--- 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]"))