BUGFIX More specific regex in Requirements->includeInHTML() to avoid …

…duplicating information by matching HTML5-style <header> tags instead of <head> (fixes #5640) (from r105667) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112500 467b73ca-7a2a-4603-9d3b-597d59a354a9
silverstripe · Oct 15, 2010 · 9c68b95 · 9c68b95
1 parent cf4a722
commit 9c68b95
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/Requirements.php b/core/Requirements.php
@@ -692,10 +692,10 @@ function includeInHTML($templateFile, $content) {
 				}
 
 				// Put CSS at the bottom of the head			
-				$content = preg_replace("/(<\/head[^>]*>)/i", $requirements . "\\1", $content);
+				$content = preg_replace("/(<\/head>)/i", $requirements . "\\1", $content);
 			} else {
-				$content = preg_replace("/(<\/head[^>]*>)/i", $requirements . "\\1", $content);
-				$content = preg_replace("/(<\/head[^>]*>)/i", $jsRequirements . "\\1", $content);
+				$content = preg_replace("/(<\/head>)/i", $requirements . "\\1", $content);
+				$content = preg_replace("/(<\/head>)/i", $jsRequirements . "\\1", $content);
 			}
 		}