De 1013 reply to includes from address too 2 0 (#162)

* Changed `Tested Up` version of WP * Changed `Tested Up` version of WP * Fix bug with wp_mail filter. release new version * Fixed bug with overriding `Reply-to` header
mailgun · Apr 8, 2023 · b3e7070 · b3e7070
1 parent b7e9711
commit b3e7070
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 Changelog
 =========
+1.9.3 (2023-04-08)
+- Fixed `Reply-to` header. It's not overridden anymore
+
 1.9.2 (2023-03-28)
 - Added action for better dev experience in tracking error `mailgun_error_track`
 - Added header `h:Sender`

diff --git a/includes/mg-filter.php b/includes/mg-filter.php
@@ -331,12 +331,3 @@ function mg_smtp_get_region($getRegion)
             return false;
     }
 }
-
-/**
- * @return false|mixed
- */
-function isReplyToOverride()
-{
-    $mg_opts = get_option('mailgun');
-    return (bool)($mg_opts['override-from'] ?? false);
-}
diff --git a/includes/wp-mail-api.php b/includes/wp-mail-api.php
@@ -245,9 +245,6 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = [])
         $from_name = mg_detect_from_name($from_name);
         $from_email = mg_detect_from_address($from_email);
         $fromString = "{$from_name} <{$from_email}>";
-        if (isReplyToOverride()) {
-            $headers['Reply-to'] = $fromString;
-        }
 
         $body = [
             'from' => $fromString,

diff --git a/mailgun.php b/mailgun.php
@@ -3,7 +3,7 @@
  * Plugin Name:  Mailgun
  * Plugin URI:   http://wordpress.org/extend/plugins/mailgun/
  * Description:  Mailgun integration for WordPress
- * Version:      1.9.2
+ * Version:      1.9.3
  * Tested up to: 6.1
  * Author:       Mailgun
  * Author URI:   http://www.mailgun.com/

diff --git a/readme.md b/readme.md
@@ -5,7 +5,7 @@ Contributors: mailgun, sivel, lookahead.io, m35dev
 Tags: mailgun, smtp, http, api, mail, email
 Requires at least: 3.3
 Tested up to: 6.1.1
-Stable tag: 1.9.1
+Stable tag: 1.9.3
 Requires PHP: 5.6
 License: GPLv2 or later
 
@@ -131,6 +131,9 @@ MAILGUN_FROM_ADDRESS Type: string
 
 == Changelog ==
 
+= 1.9.3 (2023-04-08): =
+- Fixed `Reply-to` header. It's not overridden anymore
+
 = 1.9.2 (2023-03-28): =
 - Added action for better dev experience in tracking error `mailgun_error_track`
 - Added header `h:Sender`

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Contributors: mailgun, sivel, lookahead.io, m35dev
 Tags: mailgun, smtp, http, api, mail, email
 Requires at least: 4.4
 Tested up to: 6.1.1
-Stable tag: 1.9.2
+Stable tag: 1.9.3
 Requires PHP: 5.6
 License: GPLv2 or later
 
@@ -129,6 +129,9 @@ MAILGUN_FROM_ADDRESS Type: string
 
 == Changelog ==
 
+= 1.9.3 (2023-04-08) =
+- Fixed `Reply-to` header. It's not overridden anymore
+
 = 1.9.2 (2023-03-28): =
 - Added action for better dev experience in tracking error `mailgun_error_track`
 - Added header `h:Sender`