Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14934 from woocommerce/fix/14151 

Only set reply-to if the email + name is set.
This commit is contained in:
Claudio Sanches 2017-05-08 14:43:39 -03:00 committed by GitHub
parent f4941420b0 a4ad49a8e3
commit d2fb33c7d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/emails/class-wc-email.php
View File

@ -280,7 +280,7 @@ class WC_Email extends WC_Settings_API {
public function get_headers() {
$header = "Content-Type: " . $this->get_content_type() . "\r\n";
if ( 'new_order' === $this->id ) {
if ( 'new_order' === $this->id && $this->object && $this->object->get_billing_email() && ( $this->object->get_billing_first_name() || $this->object->get_billing_last_name() ) ) {
$header .= 'Reply-to: ' . $this->object->get_billing_first_name() . ' ' . $this->object->get_billing_last_name() . ' <' . $this->object->get_billing_email() . ">\r\n";
}