From 9c68b954fdc20d0f84c19d8ffce07f9afbe09de4 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 15 Oct 2010 02:49:52 +0000 Subject: [PATCH] BUGFIX More specific regex in Requirements->includeInHTML() to avoid duplicating information by matching HTML5-style
tags instead of (fixes #5640) (from r105667) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112500 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Requirements.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Requirements.php b/core/Requirements.php index feae98c0a..8a9acb240 100644 --- a/core/Requirements.php +++ b/core/Requirements.php @@ -692,10 +692,10 @@ class Requirements_Backend { } // 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); } }