Merge with 4.11.2

2012-12-20 09:43:09 -01:00
parent 0ce9878c59 c5e7c81c19
commit ea35ac570e
6 changed files with 14 additions and 4 deletions
--- a/src/Umbraco.Core/Macros/MacroTagParser.cs
+++ b/src/Umbraco.Core/Macros/MacroTagParser.cs
@@ -66,8 +66,7 @@ namespace Umbraco.Core.Macros
 						}
 					}

-
-					var macroAlias = attributes["macroalias"] ?? attributes["alias"];
+				    var macroAlias = attributes.ContainsKey("macroalias") ? attributes["macroalias"] : attributes["alias"];

 					//call the callback now that we have the macro parsed
 					macroFoundCallback(macroAlias, attributes);