From 77c8458fbf1d729821c86fed9c9a51ed128ec693 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 22 Jan 2016 10:43:41 +0100 Subject: [PATCH] :bug: Fix addJs and addCSS problem Changes supported by tests in https://github.com/getgrav/grav/commit/27af9432e0fa9a7abb2b6a2e3f3a6f6d1 55a37e9 --- system/src/Grav/Common/Assets.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php index 1703470a2..d649979d9 100644 --- a/system/src/Grav/Common/Assets.php +++ b/system/src/Grav/Common/Assets.php @@ -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); } }