Merge pull request #4054 from putyourlightson/patch-3

Upsert bugfix
craftcms · Mar 26, 2019 · 540ab63 · 540ab63
2 parents d5a4053 + 3062def
commit 540ab63
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/db/Command.php b/src/db/Command.php
@@ -117,7 +117,9 @@ public function upsert($table, $insertColumns, $updateColumns = true, $params =
 
         // todo: hack for BC with our old upsert() method. Remove in Craft 4
         // Merge any updateColumn data into insertColumns
-        $insertColumns = array_merge($updateColumns, $insertColumns);
+        if (is_array($updateColumns)) {
+            $insertColumns = array_merge($updateColumns, $insertColumns);
+        }
 
         parent::upsert($table, $insertColumns, $updateColumns, $params);
         return $this;