Don't apply layouts to templates automatically. Fixes #9902

In Grails 2 layouts were not automatically applied to templates
rendered from a controller. This makes sense as these tend to be
partials. This fixes the issue and reverts to the previous behaviour.
Functional test found at
grails/grails3-functional-tests@29f6fa18635898
a4fa6feabd0a1cf392d0f22306

Author: graemerocher

\

@@ -0,0 +1,27 @@
+Revert "Use Gradle embedded within the "grails" process. Fixes #9640"
+
+This reverts commit 9134bc81f97a8227a5e7b635b8576e36149c6476.
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch 3.0.x
+# Your branch is up-to-date with 'origin/3.0.x'.
+#
+# You are currently bisecting, started from branch '06c1d57'.
+#
+# Changes to be committed:
+#	modified:   grails-shell/src/main/groovy/org/grails/cli/gradle/GradleUtil.groovy
+#
+# Untracked files:
+#	gradle/test
+#	grails-bootstrap/GRAILS-8488.patch
+#	grails-keys.txt.asc
+#	media/logos/grails-cupsonly-logo-black.svg
+#	media/logos/grails-cupsonly-logo-white.svg
+#	media/logos/grails-cupsonly-logo.svg
+#	pubring.gpg
+#	run.sh
+#	secring.gpg
+#	settings.xml
+#	test.sh
+#

grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy

@@ -46,6 +46,7 @@ import org.grails.web.servlet.view.GroovyPageView
 import org.grails.web.sitemesh.GrailsLayoutDecoratorMapper
 import org.grails.web.sitemesh.GrailsLayoutView
 import org.grails.web.sitemesh.GroovyPageLayoutFinder
+import org.grails.web.sitemesh.SitemeshLayoutView
 import org.grails.web.util.GrailsApplicationAttributes
 import org.springframework.beans.factory.NoSuchBeanDefinitionException
 import org.springframework.beans.factory.annotation.Autowired
@@ -319,7 +320,13 @@ trait ResponseRenderer extends WebAttributes {
                     throw new ControllerExecutionException("Unable to load template for uri [$templateUri]. Template not found.")
                 }
 
+
                 boolean renderWithLayout = (explicitSiteMeshLayout || webRequest.getCurrentRequest().getAttribute(GrailsLayoutDecoratorMapper.LAYOUT_ATTRIBUTE))
+                // if automatic decoration occurred unwrap, since this is a partial
+                if(view instanceof GrailsLayoutView) {
+                    view = ((GrailsLayoutView)view).getInnerView()
+                }
+
                 if(renderWithLayout && groovyPageLayoutFinder) {
                     applySiteMeshLayout webRequest.currentRequest, false, explicitSiteMeshLayout
                     try {
@@ -329,6 +336,7 @@ trait ResponseRenderer extends WebAttributes {
                     }
                 }
 
+
                 Map binding = [:]
 
                 if (argMap.containsKey(ARGUMENT_BEAN)) {