Merge branch '2.3-develop-emailfix' of https://github.com/gwharton/magento2 into 2.3-develop-emailfix

Graham Wharton · Graham Wharton · commit 424929fe9aee · 2018-10-18T11:36:53.000+01:00
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -187,7 +187,7 @@ public function setReplyTo($email, $name = null)
      */
     public function setFrom($from)
     {
-        return($this->setFromByStore($from));
+        return $this->setFromByStore($from, null);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public function setReplyTo($email, $name = null)`
`187`	`187`	`*/`
`188`	`188`	`public function setFrom($from)`
`189`	`189`	`{`
`190`		`- return($this->setFromByStore($from));`
	`190`	`+ return $this->setFromByStore($from, null);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`/**`