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

🐛 Fix addJs and addCSS problem

Browse Source 
Changes supported by tests in
https://github.com/getgrav/grav/commit/27af9432e0fa9a7abb2b6a2e3f3a6f6d1
55a37e9
This commit is contained in:
Flavio Copes
2016-01-22 10:43:41 +01:00
parent 774cf2d6d0
commit 77c8458fbf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,7 +273,7 @@ class Assets
];
// check for dynamic array and merge with defaults
if (func_num_args() == 3) {
if (func_num_args() > 1) {
$dynamic_arg = func_get_arg(1);
if (is_array($dynamic_arg)) {
$data = array_merge($data, $dynamic_arg);
@@ -332,10 +332,10 @@ class Assets
];
// check for dynamic array and merge with defaults
if (func_num_args() == 3) {
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);
}
}