Merge

2013-01-18 13:53:09 -01:00
parent 5cb865f4c4 480bd39687
commit e1902a54f0
1 changed files with 4 additions and 0 deletions
--- a/src/umbraco.cms/businesslogic/macro/Macro.cs
+++ b/src/umbraco.cms/businesslogic/macro/Macro.cs
@@ -333,6 +333,10 @@ namespace umbraco.cms.businesslogic.macro
                m.Xslt = xmlHelper.GetNodeValue(n.SelectSingleNode("xslt"));
                m.RefreshRate = int.Parse(xmlHelper.GetNodeValue(n.SelectSingleNode("refreshRate")));

+                // we need to validate if the usercontrol is missing the tilde prefix requirement introduced in v6
+                if (String.IsNullOrEmpty(m.Assembly) && !String.IsNullOrEmpty(m.Type) && !m.Type.StartsWith("~"))
+                    m.Type = "~/" + m.Type;
+
                if (n.SelectSingleNode("scriptingFile") != null)
                    m.ScriptingFile = xmlHelper.GetNodeValue(n.SelectSingleNode("scriptingFile"));