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

vkorotun · vkorotun · commit 48fcb26d6337 · 2016-09-14T12:25:27.000+03:00
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -669,7 +669,7 @@ public function getTemplateFilter()
      */
     public function emulateDesign($storeId, $area = self::DEFAULT_DESIGN_AREA)
     {
-        if ($storeId) {
+        if ($storeId !== false) {
             // save current design settings
             $this->emulatedDesignConfig = clone $this->getDesignConfig();
             if (

Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ public function getTemplateFilter()`
`669`	`669`	`*/`
`670`	`670`	`public function emulateDesign($storeId, $area = self::DEFAULT_DESIGN_AREA)`
`671`	`671`	`{`
`672`		`- if ($storeId) {`
	`672`	`+ if ($storeId !== false) {`
`673`	`673`	`// save current design settings`
`674`	`674`	`$this->emulatedDesignConfig = clone $this->getDesignConfig();`
`675`	`675`	`if (`