mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX Requirements were ignored if only CSS requirements were present due to bug in Requirements::includeInHTML()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72374 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
8f0979eb78
commit
2e8a572875
@ -529,7 +529,7 @@ class Requirements_Backend {
|
|||||||
function includeInHTML($templateFile, $content) {
|
function includeInHTML($templateFile, $content) {
|
||||||
if(isset($_GET['debug_profile'])) Profiler::mark("Requirements::includeInHTML");
|
if(isset($_GET['debug_profile'])) Profiler::mark("Requirements::includeInHTML");
|
||||||
|
|
||||||
if(strpos($content, '</head') !== false && ($this->javascript || $this->customCSS || $this->customScript || $this->customHeadTags)) {
|
if(strpos($content, '</head') !== false && ($this->css || $this->javascript || $this->customCSS || $this->customScript || $this->customHeadTags)) {
|
||||||
$requirements = '';
|
$requirements = '';
|
||||||
$jsRequirements = '';
|
$jsRequirements = '';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user