Merge branch '2.3.x' into 2.4.x

lhotari · lhotari · commit c2d62d2781ed · 2014-06-12T17:13:11.000+03:00
diff --git a/grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/sitemesh/FullSitemeshLifeCycleTests.groovy b/grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/sitemesh/FullSitemeshLifeCycleTests.groovy
@@ -192,4 +192,46 @@ class FullSitemeshLifeCycleTests extends AbstractGrailsTagTests {
 
         assertEquals 'good', result
     }
+    
+    // GRAILS-11484
+    void testMultilineTitle() {
+        def template = '''
+<html>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+This is the title
+</title></head>
+        <body onload="test();">body text</body>
+</html>
+'''
+
+        assertOutputEquals '''
+<html>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+This is the title
+</title></head>
+        <body onload="test();">body text</body>
+</html>
+''', template
+
+        def layout = '''
+<html>
+    <head><title>Decorated <g:layoutTitle /></title><g:layoutHead /></head>
+    <body><h1>Hello</h1><g:layoutBody /></body>
+</html>
+'''
+        def result = applyLayout(layout, template)
+
+        assertEquals '''
+<html>
+    <head><title>Decorated 
+This is the title
+</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+    <body><h1>Hello</h1>body text</body>
+</html>
+''', result
+    }
+
 }
diff --git a/grails-web-sitemesh/src/main/groovy/org/codehaus/groovy/grails/web/sitemesh/GSPSitemeshPage.java b/grails-web-sitemesh/src/main/groovy/org/codehaus/groovy/grails/web/sitemesh/GSPSitemeshPage.java
@@ -93,7 +93,7 @@ public void writeHead(Writer out) throws IOException {
             }
             String headAsString = headBuffer.toString();
             // strip out title for sitemesh version of <head>
-            out.write(headAsString.replaceFirst("<title(\\s[^>]*)?>(.*?)</title>",""));
+            out.write(headAsString.replaceFirst("(?is)<title(\\s[^>]*)?>(.*?)</title>",""));
         }
         else {
             headBuffer.writeTo(out);

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public void writeHead(Writer out) throws IOException {`
`93`	`93`	`}`
`94`	`94`	`String headAsString = headBuffer.toString();`
`95`	`95`	`// strip out title for sitemesh version of <head>`
`96`		`- out.write(headAsString.replaceFirst("<title(\\s[^>])?>(.?)</title>",""));`
	`96`	`+ out.write(headAsString.replaceFirst("(?is)<title(\\s[^>])?>(.?)</title>",""));`
`97`	`97`	`}`
`98`	`98`	`else {`
`99`	`99`	`headBuffer.writeTo(out);`