From 2a058cdbccd42623878a66edd05b032c4ef86f25 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Thu, 14 Mar 2013 22:01:09 +0000 Subject: [PATCH] Fixed a conflict-references between Constants (in Umbraco.Web.Mvc and Umbraco.Core) --- src/Umbraco.Web/Macros/PartialViewMacroEngine.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs index be0d4dc332..e454a99f17 100644 --- a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs +++ b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs @@ -124,9 +124,9 @@ namespace Umbraco.Web.Macros if (mvcHandler != null) { //try and extract the current view context from the route values, this would be set in the UmbracoViewPage. - if (mvcHandler.RequestContext.RouteData.DataTokens.ContainsKey(Constants.DataTokenCurrentViewContext)) + if (mvcHandler.RequestContext.RouteData.DataTokens.ContainsKey(Umbraco.Web.Mvc.Constants.DataTokenCurrentViewContext)) { - viewContext = (ViewContext) mvcHandler.RequestContext.RouteData.DataTokens[Constants.DataTokenCurrentViewContext]; + viewContext = (ViewContext) mvcHandler.RequestContext.RouteData.DataTokens[Umbraco.Web.Mvc.Constants.DataTokenCurrentViewContext]; } routeVals.DataTokens.Add("ParentActionViewContext", viewContext); }