From 69dc15775bbcc215c27e48a9c8bedead3bfb4b12 Mon Sep 17 00:00:00 2001
From: mdcode <bv.volkov@gmail.com>
Date: Fri, 29 Nov 2019 15:15:30 +0500
Subject: [PATCH] Update shopWorkflowAction.class.php

---
 lib/workflow/shopWorkflowAction.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/workflow/shopWorkflowAction.class.php b/lib/workflow/shopWorkflowAction.class.php
index 2b62dabdd..28b945568 100644
--- a/lib/workflow/shopWorkflowAction.class.php
+++ b/lib/workflow/shopWorkflowAction.class.php
@@ -554,8 +554,7 @@ protected function getShippingFields($order_id, $state)
                     if (!empty($order['params']['shipping_data_'.$name])) {
                         $control['value'] = $order['params']['shipping_data_'.$name];
                     }
-                    $control = array_merge($control, $params);
-                    $controls[$name] = waHtmlControl::getControl($control['control_type'], $name, $control);
+                    $controls[$name] = waHtmlControl::getControl($control['control_type'], $name, $control + $params);
                 }
             }
         }