Removed code duplication

Graham Wharton · Graham Wharton · commit 0dc85785e522 · 2018-10-16T10:13:30.000+01:00
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -177,16 +177,17 @@ public function setReplyTo($email, $name = null)
     /**
      * Set mail from address
      *
-     * @deprecated Use setFromByStore
+     * @deprecated This function sets the from address for the first store only.
+     * new function setFromByStore introduced to allow setting of from address
+     * based on store.
+     * @see setFromByStore()
      * 
      * @param string|array $from
      * @return $this
      */
-    public function setFrom($from, $store = null)
+    public function setFrom($from)
     {
-        $result = $this->_senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
-        return $this;
+        return($this->setFromByStore($from));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -177,16 +177,17 @@ public function setReplyTo($email, $name = null)`
`177`	`177`	`/**`
`178`	`178`	`* Set mail from address`
`179`	`179`	`*`
`180`		`- * @deprecated Use setFromByStore`
	`180`	`+ * @deprecated This function sets the from address for the first store only.`
	`181`	`+ * new function setFromByStore introduced to allow setting of from address`
	`182`	`+ * based on store.`
	`183`	`+ * @see setFromByStore()`
`181`	`184`	`*`
`182`	`185`	`* @param string\|array $from`
`183`	`186`	`* @return $this`
`184`	`187`	`*/`
`185`		`- public function setFrom($from, $store = null)`
	`188`	`+ public function setFrom($from)`
`186`	`189`	`{`
`187`		`- $result = $this->_senderResolver->resolve($from, $store);`
`188`		`- $this->message->setFrom($result['email'], $result['name']);`
`189`		`- return $this;`
	`190`	`+ return($this->setFromByStore($from));`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`/**`