From bb6848dd0372110be227bc9918c3ff45afc7b3ba Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Fri, 4 Jan 2019 11:44:23 +0100
Subject: [PATCH] #3417 renamed existing macrocontroller to macro rendering
 controller

---
 src/Umbraco.Web/Editors/BackOfficeServerVariables.cs          | 2 +-
 .../{MacroController.cs => MacroRenderingController.cs}       | 4 ++--
 src/Umbraco.Web/Umbraco.Web.csproj                            | 2 +-
 src/Umbraco.Web/umbraco.presentation/page.cs                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Umbraco.Web/Editors/{MacroController.cs => MacroRenderingController.cs} (97%)

diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 5bc01fa534..aab5f13479 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -169,7 +169,7 @@ namespace Umbraco.Web.Editors
                                 controller => controller.GetAllowedChildren(0))
                         },
                         {
-                            "macroApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<MacroController>(
+                            "macroApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<MacroRenderingController>(
                                 controller => controller.GetMacroParameters(0))
                         },
                         {
diff --git a/src/Umbraco.Web/Editors/MacroController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
similarity index 97%
rename from src/Umbraco.Web/Editors/MacroController.cs
rename to src/Umbraco.Web/Editors/MacroRenderingController.cs
index 3c576befb9..e585f28c09 100644
--- a/src/Umbraco.Web/Editors/MacroController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -27,11 +27,11 @@ namespace Umbraco.Web.Editors
     /// Session, we don't want it to throw null reference exceptions.
     /// </remarks>
     [PluginController("UmbracoApi")]
-    public class MacroController : UmbracoAuthorizedJsonController, IRequiresSessionState
+    public class MacroRenderingController : UmbracoAuthorizedJsonController, IRequiresSessionState
     {
         private readonly IVariationContextAccessor _variationContextAccessor;
 
-        public MacroController(IVariationContextAccessor variationContextAccessor)
+        public MacroRenderingController(IVariationContextAccessor variationContextAccessor)
         {
             _variationContextAccessor = variationContextAccessor;
         }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 17c2a54d81..16fbd6aa29 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -751,7 +751,7 @@
     <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
     <Compile Include="Mvc\UmbracoViewPage.cs" />
     <Compile Include="Editors\LogController.cs" />
-    <Compile Include="Editors\MacroController.cs" />
+    <Compile Include="Editors\MacroRenderingController.cs" />
     <Compile Include="Editors\MemberTypeController.cs" />
     <Compile Include="Editors\UpdateCheckController.cs" />
     <Compile Include="MembershipProviderExtensions.cs" />
diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
index 219e2101be..a2ccc1e094 100644
--- a/src/Umbraco.Web/umbraco.presentation/page.cs
+++ b/src/Umbraco.Web/umbraco.presentation/page.cs
@@ -102,7 +102,7 @@ namespace umbraco
         /// Initializes a new instance of the page for a content.
         /// </summary>
         /// <param name="content">The content.</param>
-        /// <remarks>This is for <see cref="MacroController"/> usage only.</remarks>
+        /// <remarks>This is for <see cref="MacroRenderingController"/> usage only.</remarks>
         internal page(IContent content, IVariationContextAccessor variationContextAccessor)
             : this(new PagePublishedContent(content, variationContextAccessor))
         { }