From 22f25ee467c473285ae1992b614e0d4cfa49d9e3 Mon Sep 17 00:00:00 2001 From: Ed Parry Date: Sun, 23 Sep 2018 13:39:51 +0100 Subject: [PATCH] Replaced references of PageID with the UmbracoContext calls. --- src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs | 2 +- src/Umbraco.Web/Editors/MacroController.cs | 1 - src/Umbraco.Web/Routing/PublishedRouter.cs | 4 +--- src/Umbraco.Web/Templates/TemplateRenderer.cs | 6 ++---- src/Umbraco.Web/UmbracoContext.cs | 3 +-- .../umbraco.presentation/umbraco/Web/UI/ContentPage.cs | 6 +----- .../umbraco.presentation/umbraco/templateControls/Item.cs | 4 ++-- .../umbraco.presentation/umbraco/templateControls/Macro.cs | 2 +- 8 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs index df7e1d9d09..66b476a29d 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs @@ -51,7 +51,7 @@ namespace Umbraco.Tests.PublishedContent request.Culture = new CultureInfo("en-AU"); publishedRouter.ConfigureRequest(request); - Assert.AreEqual(1, umbracoContext.HttpContext.Items["pageID"]); + Assert.AreEqual(1, umbracoContext.PageId); Assert.AreEqual(request.UmbracoPage.Elements.Count, ((Hashtable) umbracoContext.HttpContext.Items["pageElements"]).Count); } diff --git a/src/Umbraco.Web/Editors/MacroController.cs b/src/Umbraco.Web/Editors/MacroController.cs index d625e3a575..3c576befb9 100644 --- a/src/Umbraco.Web/Editors/MacroController.cs +++ b/src/Umbraco.Web/Editors/MacroController.cs @@ -135,7 +135,6 @@ namespace Umbraco.Web.Editors var legacyPage = new global::umbraco.page(doc, _variationContextAccessor); - UmbracoContext.HttpContext.Items["pageID"] = doc.Id; UmbracoContext.HttpContext.Items["pageElements"] = legacyPage.Elements; UmbracoContext.HttpContext.Items[global::Umbraco.Core.Constants.Conventions.Url.AltTemplate] = null; diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs index 42137d3b9e..c8a66aa076 100644 --- a/src/Umbraco.Web/Routing/PublishedRouter.cs +++ b/src/Umbraco.Web/Routing/PublishedRouter.cs @@ -211,7 +211,6 @@ namespace Umbraco.Web.Routing frequest.UmbracoPage = new page(frequest); // used by many legacy objects - frequest.UmbracoContext.HttpContext.Items["pageID"] = frequest.PublishedContent.Id; frequest.UmbracoContext.HttpContext.Items["pageElements"] = frequest.UmbracoPage.Elements; return true; @@ -257,8 +256,7 @@ namespace Umbraco.Web.Routing // handlers like default.aspx will want it and most macros currently need it request.UmbracoPage = new page(request); - // these two are used by many legacy objects - request.UmbracoContext.HttpContext.Items["pageID"] = request.PublishedContent.Id; + // this is used by many legacy objects request.UmbracoContext.HttpContext.Items["pageElements"] = request.UmbracoPage.Elements; } diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index f2fe2f9a80..e0b5c8c301 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -202,7 +202,6 @@ namespace Umbraco.Web.Templates // handlers like default.aspx will want it and most macros currently need it request.UmbracoPage = new page(request); //now, set the new ones for this page execution - _umbracoContext.HttpContext.Items["pageID"] = request.PublishedContent.Id; _umbracoContext.HttpContext.Items["pageElements"] = request.UmbracoPage.Elements; _umbracoContext.HttpContext.Items[Core.Constants.Conventions.Url.AltTemplate] = null; _umbracoContext.PublishedRequest = request; @@ -214,8 +213,8 @@ namespace Umbraco.Web.Templates private void SaveExistingItems() { //Many objects require that these legacy items are in the http context items... before we render this template we need to first - //save the values in them so that we can re-set them after we render so the rest of the execution works as per normal. - _oldPageId = _umbracoContext.HttpContext.Items["pageID"]; + //save the values in them so that we can re-set them after we render so the rest of the execution works as per normal + _oldPageId = _umbracoContext.PageId; _oldPageElements = _umbracoContext.HttpContext.Items["pageElements"]; _oldPublishedRequest = _umbracoContext.PublishedRequest; _oldAltTemplate = _umbracoContext.HttpContext.Items[Umbraco.Core.Constants.Conventions.Url.AltTemplate]; @@ -227,7 +226,6 @@ namespace Umbraco.Web.Templates private void RestoreItems() { _umbracoContext.PublishedRequest = _oldPublishedRequest; - _umbracoContext.HttpContext.Items["pageID"] = _oldPageId; _umbracoContext.HttpContext.Items["pageElements"] = _oldPageElements; _umbracoContext.HttpContext.Items[Umbraco.Core.Constants.Conventions.Url.AltTemplate] = _oldAltTemplate; } diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs index 198721618d..854f5a46b5 100644 --- a/src/Umbraco.Web/UmbracoContext.cs +++ b/src/Umbraco.Web/UmbracoContext.cs @@ -262,8 +262,7 @@ namespace Umbraco.Web { try { - //TODO: this should be done with a wrapper: http://issues.umbraco.org/issue/U4-61 - return int.Parse(HttpContext.Items["pageID"].ToString()); + return Current.PublishedRequest.PublishedContent.Id; } catch { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Web/UI/ContentPage.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Web/UI/ContentPage.cs index de7d9574ae..7dcb287740 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Web/UI/ContentPage.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Web/UI/ContentPage.cs @@ -11,11 +11,7 @@ namespace umbraco.presentation.Web.UI public int UmbracoNodeId { - set - { - _id = value; - System.Web.HttpContext.Current.Items["pageID"] = _id; - } + set { _id = value; } get {return _id;} } public ContentPage() diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs index 14b4824171..89a03a1437 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs @@ -203,9 +203,9 @@ namespace umbraco.presentation.templateControls return nodeIdInt; } } - else if (PageElements["pageID"] != null) + else if (UmbracoContext.Current.PageId != null) { - return int.Parse(PageElements["pageID"].ToString()); + return UmbracoContext.Current.PageId.Value; } return null; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs index 3635ab7eda..0d54ce2a02 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs @@ -132,7 +132,7 @@ namespace umbraco.presentation.templateControls // set pageId to int.MinValue if no pageID was found, // e.g. if the macro was rendered on a custom (non-Umbraco) page - var pageId = Context.Items["pageID"] == null ? int.MinValue : int.Parse(Context.Items["pageID"].ToString()); + var pageId = UmbracoContext.Current.PageId == null ? int.MinValue : UmbracoContext.Current.PageId.Value; if ((string.IsNullOrEmpty(Language) == false && Text != "") || string.IsNullOrEmpty(FileLocation) == false) { var tempMacro = new MacroModel();