Merge pull request umbraco#5719 from umbraco/v8/bug/5700

Warren Buckley · web-flow · commit f5fde0f19eb5 · 2019-06-26T10:07:44.000+01:00
Fixes Macro Rendered in Richtext Editor when not configured to do so
diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -108,7 +108,7 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,
 
             //if it isn't supposed to be rendered in the editor then return an empty string
             //currently we cannot render a macro if the page doesn't yet exist
-            if (pageId == -1 || publishedContent == null || !m.UseInEditor)
+            if (pageId == -1 || publishedContent == null || m.DontRender)
             {
                 var response = Request.CreateResponse();
                 //need to create a specific content result formatted as HTML since this controller has been configured

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId,`
`108`	`108`
`109`	`109`	`//if it isn't supposed to be rendered in the editor then return an empty string`
`110`	`110`	`//currently we cannot render a macro if the page doesn't yet exist`
`111`		`- if (pageId == -1 \|\| publishedContent == null \|\| !m.UseInEditor)`
	`111`	`+ if (pageId == -1 \|\| publishedContent == null \|\| m.DontRender)`
`112`	`112`	`{`
`113`	`113`	`var response = Request.CreateResponse();`
`114`	`114`	`//need to create a specific content result formatted as HTML since this controller has been configured`