Option of recursive merge parameters

bitrix-expert · May 7, 2015 · 0ecc95a · 0ecc95a
1 parent a36470d
commit 0ecc95a
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/lib/traits/elements.php b/lib/traits/elements.php
@@ -517,13 +517,23 @@ protected function setParamsFilters()
     /**
      * Add new fields to global filter
      *
-     * @param array $fields
+     * @param array $fields Array with fields
+     * @param bool $recursiveMerge If true, $fields will be recursive merged with
+     * other parameters (used array_merge_recursive()), otherwise not recursive merge (used array_merge()).
      */
-    public function addGlobalFilters(array $fields)
+    public function addGlobalFilters(array $fields, $recursiveMerge = false)
     {
         if (is_array($fields) && !empty($fields))
         {
-            $this->filterParams = array_merge_recursive($this->filterParams, $fields);
+            if ($recursiveMerge)
+            {
+                $this->filterParams = array_merge_recursive($this->filterParams, $fields);
+            }
+            else
+            {
+                $this->filterParams = array_merge($this->filterParams, $fields);
+            }
+
             $this->addCacheAdditionalId($fields);
         }
     }