From 4cb03ab36ce3357683a4cb5ad45218c92ad0781a Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Fri, 16 Nov 2012 10:08:12 +0500
Subject: [PATCH] Fixes issue with ChildActions when inherting from
 UmbracoViewPage<T> and using the @Umbraco helper.

---
 src/Umbraco.Web/Mvc/UmbracoViewPage.cs | 46 ++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPage.cs b/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
index ed3c18e181..ff926fd4b4 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
@@ -19,7 +19,28 @@ namespace Umbraco.Web.Mvc
 		/// </summary>
 		public UmbracoContext UmbracoContext
 		{
-			get { return (UmbracoContext) ViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-context"); }
+			get
+			{
+				//we should always try to return the context from the data tokens just in case its a custom context and not 
+				//using the UmbracoContext.Current.
+				//we will fallback to the singleton if necessary.
+				if (ViewContext.RouteData.DataTokens.ContainsKey("umbraco-context"))
+				{
+					return (UmbracoContext)ViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-context");	
+				}
+				//next check if it is a child action and see if the parent has it set in data tokens
+				if (ViewContext.IsChildAction)
+				{
+					if (ViewContext.ParentActionViewContext.RouteData.DataTokens.ContainsKey("umbraco-context"))
+					{
+						return (UmbracoContext)ViewContext.ParentActionViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-context");
+					}	
+				}
+				
+				//lastly, we will use the singleton, the only reason this should ever happen is is someone is rendering a page that inherits from this
+				//class and are rendering it outside of the normal Umbraco routing process. Very unlikely.
+				return UmbracoContext.Current;
+			}
 		}
 
 		/// <summary>
@@ -35,7 +56,28 @@ namespace Umbraco.Web.Mvc
 		/// </summary>
 		internal PublishedContentRequest PublishedContentRequest
 		{
-			get { return (PublishedContentRequest)ViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-doc-request"); }
+			get
+			{
+				//we should always try to return the object from the data tokens just in case its a custom object and not 
+				//using the UmbracoContext.Current.
+				//we will fallback to the singleton if necessary.
+				if (ViewContext.RouteData.DataTokens.ContainsKey("umbraco-doc-request"))
+				{
+					return (PublishedContentRequest)ViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-doc-request");
+				}
+				//next check if it is a child action and see if the parent has it set in data tokens
+				if (ViewContext.IsChildAction)
+				{
+					if (ViewContext.ParentActionViewContext.RouteData.DataTokens.ContainsKey("umbraco-doc-request"))
+					{
+						return (PublishedContentRequest)ViewContext.ParentActionViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-doc-request");
+					}
+				}
+
+				//lastly, we will use the singleton, the only reason this should ever happen is is someone is rendering a page that inherits from this
+				//class and are rendering it outside of the normal Umbraco routing process. Very unlikely.
+				return UmbracoContext.Current.PublishedContentRequest;
+			}
 		}
 
 		private UmbracoHelper _helper;