Merge branch '3.1.x' into 3.2.x

graemerocher · graemerocher · commit 7b8ce27d65fc · 2016-12-15T09:05:30.000+01:00
diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy b/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy
@@ -275,7 +275,7 @@ trait ResponseRenderer extends WebAttributes {
                 if (isPromise) return
             }
 
-            applyContentType webRequest.currentResponse, argMap, null
+            applyContentType webRequest.currentResponse, argMap, null, false
 
             Map model
             if (modelObject instanceof Map) {
diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RenderDynamicMethodTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RenderDynamicMethodTests.groovy
@@ -24,7 +24,6 @@ class RenderDynamicMethodTests  {
         controller.renderView()
 
         assertEquals '/renderDynamicMethodTest/foo', controller.modelAndView.viewName
-        assertEquals 'text/html;charset=utf-8', response.contentType
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ trait ResponseRenderer extends WebAttributes {`
`275`	`275`	`if (isPromise) return`
`276`	`276`	`}`
`277`	`277`
`278`		`- applyContentType webRequest.currentResponse, argMap, null`
	`278`	`+ applyContentType webRequest.currentResponse, argMap, null, false`
`279`	`279`
`280`	`280`	`Map model`
`281`	`281`	`if (modelObject instanceof Map) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ class RenderDynamicMethodTests {`
`24`	`24`	`controller.renderView()`
`25`	`25`
`26`	`26`	`assertEquals '/renderDynamicMethodTest/foo', controller.modelAndView.viewName`
`27`		`- assertEquals 'text/html;charset=utf-8', response.contentType`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`@Test`