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

Ensure Requirements_Backend respects explicit false for async/defer

Browse Source
This commit is contained in:
Michal Kleiner 2019-10-30 09:47:24 +13:00
parent 0cf5d4cbe2
commit 4f614423ad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/View/Requirements_Backend.php
View File

@ -416,19 +416,19 @@ class Requirements_Backend
// make sure that async/defer is set if it is set once even if file is included multiple times // make sure that async/defer is set if it is set once even if file is included multiple times
$async = ( $async = (
isset($options['async']) && isset($options['async']) == true isset($options['async']) && $options['async']
|| ( || (
isset($this->javascript[$file]) isset($this->javascript[$file])
&& isset($this->javascript[$file]['async']) && isset($this->javascript[$file]['async'])
&& $this->javascript[$file]['async'] == true && $this->javascript[$file]['async']
) )
); );
$defer = ( $defer = (
isset($options['defer']) && isset($options['defer']) == true isset($options['defer']) && $options['defer']
|| ( || (
isset($this->javascript[$file]) isset($this->javascript[$file])
&& isset($this->javascript[$file]['defer']) && isset($this->javascript[$file]['defer'])
&& $this->javascript[$file]['defer'] == true && $this->javascript[$file]['defer']
) )
); );
$this->javascript[$file] = array( $this->javascript[$file] = array(