Merge

2013-01-21 15:27:42 -01:00
parent 00e316b5bd 652abe3838
commit e55593fc34
1 changed files with 5 additions and 0 deletions
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -422,6 +422,11 @@ namespace umbraco
                        try
                        {
 							TraceInfo("umbracoMacro","Usercontrol added (" + Model.TypeName + ")");
+                            
+                            // Add tilde for v4 defined macros
+                            if (string.IsNullOrEmpty(Model.TypeName) == false && Model.TypeName.StartsWith("~") == false)
+                                Model.TypeName = "~/" + Model.TypeName;
+
                            macroControl = loadUserControl(ScriptType, Model, pageElements);
                            break;
                        }