issue magento#20111 fixed

mahesh-rajawat · Jan 9, 2019 · a4fc94a · a4fc94a
1 parent 9c6af93
commit a4fc94a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
@@ -187,11 +187,11 @@ public function getVariables()
         $variables = $this->_variables->toOptionArray(true);
         $customVariables = $this->_variableFactory->create()->getVariablesOptionArray(true);
         if ($customVariables) {
-            $variables = array_merge_recursive($variables, $customVariables);
+            $variables[] = $customVariables;
         }
         $template = $this->getEmailTemplate();
         if ($template->getId() && ($templateVariables = $template->getVariablesOptionArray(true))) {
-            $variables = array_merge_recursive($variables, $templateVariables);
+            $variables[] = $templateVariables;
         }
         return $variables;
     }