Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-09 00:37:13 +02:00
Code Issues Packages Projects Releases Activity

Recreated an issue in calling with an array of values {% do assets.addJs('jquery', {'loading':'async'}) %} introduced in d5bd99b363

Browse Source
This commit is contained in:
Flavio Copes
2016-01-22 00:09:14 +01:00
parent 8270edbc78
commit 774cf2d6d0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/src/Grav/Common/Assets.php
View File

@@ -251,7 +251,7 @@ class Assets
}
return $this;
} elseif (isset($this->collections[$asset])) {
$this->addCss($this->collections[$asset], $priority, $pipeline, $group);
$this->add($this->collections[$asset], $priority, $pipeline, $group);
return $this;
}
@@ -273,7 +273,7 @@ class Assets
];
// check for dynamic array and merge with defaults
if (func_num_args() == 2) {
if (func_num_args() == 3) {
$dynamic_arg = func_get_arg(1);
if (is_array($dynamic_arg)) {
$data = array_merge($data, $dynamic_arg);
@@ -309,7 +309,7 @@ class Assets
}
return $this;
} elseif (isset($this->collections[$asset])) {
$this->addJs($this->collections[$asset], $priority, $pipeline, $loading, $group);
$this->add($this->collections[$asset], $priority, $pipeline, $loading, $group);
return $this;
}
@@ -332,7 +332,7 @@ class Assets
];
// check for dynamic array and merge with defaults
if (func_num_args() == 2) {
if (func_num_args() == 3) {
$dynamic_arg = func_get_arg(1);
if (is_array($dynamic_arg)) {
$data = array_merge($data, $dynamic_arg);