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
This commit is contained in:
Ingo Schommer 2010-10-15 02:49:52 +00:00
parent cf4a722cc8
commit 9c68b954fd

View File

@ -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);
}
}