tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 22:28:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX More specific regex in Requirements->includeInHTML() to avoid duplicating information by matching HTML5-style <header> tags instead of <head> (fixes #5640)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105667 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-05-25 20:52:12 +00:00 committed by Sam Minnee
parent 8c99b2ec18
commit 93f05f8acb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Requirements.php
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);
}
}