From ecfea8b2538204b33b1a502f295b39debaa1fa3d Mon Sep 17 00:00:00 2001 From: Artem Yarygin Date: Thu, 4 Feb 2016 17:53:47 +0400 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?= =?UTF-8?q?=D0=B0=20=D1=81=20warning=20=D0=BF=D1=80=D0=B8=20=D1=83=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B5=20=D0=B0=D1=82=D1=82?= =?UTF-8?q?=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=BE=D0=B2=20=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=BF=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/traits/elements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/traits/elements.php b/lib/traits/elements.php index 99b7e99..2fd04e9 100644 --- a/lib/traits/elements.php +++ b/lib/traits/elements.php @@ -548,7 +548,7 @@ public function addParamsGrouping($fields = []) { if (is_array($fields) && !empty($fields)) { - $this->groupingParams = array_merge($this->groupingParams, $fields); + $this->groupingParams = array_merge(is_array($this->groupingParams) ? $this->groupingParams : [], $fields); } }