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

Merge pull request #623 from getgrav/feature/fix-loading-js-and-css-from-collections

Browse Source 
Fix loading js and css from collections
This commit is contained in:
Andy Miller
2016-01-26 10:53:49 -07:00
parent 172236e58d f82b40ef49
commit fb50c4a4f0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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