Merge commit 'refs/pull/8327/head' of https://github.com/magento/magento2 into MAGETWO-63881

vrann · vrann · commit c04127c1d02e · 2017-01-30T15:44:05.000-06:00
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -352,7 +352,7 @@ public function getProcessedTemplate(array $variables = [])
             $result = $processor->filter($this->getTemplateText());
         } catch (\Exception $e) {
             $this->cancelDesignConfig();
-            throw new \LogicException(__($e->getMessage()), $e);
+            throw new \LogicException(__($e->getMessage()), $e->getCode(), $e);
         }
         if ($isDesignApplied) {
             $this->cancelDesignConfig();

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ public function getProcessedTemplate(array $variables = [])`
`352`	`352`	`$result = $processor->filter($this->getTemplateText());`
`353`	`353`	`} catch (\Exception $e) {`
`354`	`354`	`$this->cancelDesignConfig();`
`355`		`- throw new \LogicException(__($e->getMessage()), $e);`
	`355`	`+ throw new \LogicException(__($e->getMessage()), $e->getCode(), $e);`
`356`	`356`	`}`
`357`	`357`	`if ($isDesignApplied) {`
`358`	`358`	`$this->cancelDesignConfig();`