ENGCOM-1516: fix: do not set forced area in template, fixes #14968 #15137

Stanislav Idolov · web-flow · commit 7019a0a13920 · 2018-05-16T20:46:24.000+03:00
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -534,10 +534,9 @@ protected function cancelDesignConfig()
      */
     public function setForcedArea($templateId)
     {
-        if ($this->area) {
-            throw new \LogicException(__('Area is already set'));
+        if (!isset($this->area)) {
+            $this->area = $this->emailConfig->getTemplateArea($templateId);
         }
-        $this->area = $this->emailConfig->getTemplateArea($templateId);
         return $this;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -534,10 +534,9 @@ protected function cancelDesignConfig()`
`534`	`534`	`*/`
`535`	`535`	`public function setForcedArea($templateId)`
`536`	`536`	`{`
`537`		`- if ($this->area) {`
`538`		`- throw new \LogicException(__('Area is already set'));`
	`537`	`+ if (!isset($this->area)) {`
	`538`	`+ $this->area = $this->emailConfig->getTemplateArea($templateId);`
`539`	`539`	`}`
`540`		`- $this->area = $this->emailConfig->getTemplateArea($templateId);`
`541`	`540`	`return $this;`
`542`	`541`	`}`
`543`	`542`