diff --git a/wp-content/plugins/smtp-mailer/main.php b/wp-content/plugins/smtp-mailer/main.php index e72827e7..89bae4f2 100644 --- a/wp-content/plugins/smtp-mailer/main.php +++ b/wp-content/plugins/smtp-mailer/main.php @@ -1,7 +1,7 @@
';
@@ -301,6 +306,11 @@ class SMTP_MAILER {
$options = smtp_mailer_get_empty_options_array();
}
+ // Avoid warning notice since this option was added later
+ if(!isset($options['force_from_address'])){
+ $options['force_from_address'] = '';
+ }
+
// Avoid warning notice since this option was added later
if(!isset($options['disable_ssl_verification'])){
$options['disable_ssl_verification'] = '';
@@ -374,6 +384,12 @@ class SMTP_MAILER {
+
+
+
+ value="1">
+
+
value="1">
@@ -420,6 +436,7 @@ function smtp_mailer_get_empty_options_array(){
$options['smtp_port'] = '';
$options['from_email'] = '';
$options['from_name'] = '';
+ $options['force_from_address'] = '';
$options['disable_ssl_verification'] = '';
return $options;
}
@@ -659,7 +676,11 @@ function smtp_mailer_pre_wp_mail($null, $atts)
* @param string $from_name Name associated with the "from" email address.
*/
$from_name = apply_filters( 'wp_mail_from_name', $from_name );
-
+ //force from address if checked
+ if(isset($options['force_from_address']) && !empty($options['force_from_address'])){
+ $from_name = $options['from_name'];
+ $from_email = $options['from_email'];
+ }
try {
$phpmailer->setFrom( $from_email, $from_name, false );
} catch ( PHPMailer\PHPMailer\Exception $e ) {
diff --git a/wp-content/plugins/smtp-mailer/readme.txt b/wp-content/plugins/smtp-mailer/readme.txt
index 150465ad..1f9a5733 100644
--- a/wp-content/plugins/smtp-mailer/readme.txt
+++ b/wp-content/plugins/smtp-mailer/readme.txt
@@ -2,9 +2,9 @@
Contributors: naa986
Donate link: https://wphowto.net/
Tags: email, mail, smtp, phpmailer
-Requires at least: 6.3
-Tested up to: 6.3
-Stable tag: 1.1.9
+Requires at least: 6.4
+Tested up to: 6.4
+Stable tag: 1.1.11
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -56,42 +56,7 @@ For detailed setup instructions please visit the [SMTP Mailer](https://wphowto.n
1. Click "Install Now" and then hit the activate button
== Frequently Asked Questions ==
-
-= Can I send email via SMTP from my website using this plugin? =
-
-Yes.
-
-= Can I use this plugin with Gmail SMTP? =
-
-Yes.
-
-= Can I use this plugin on any SMTP port? =
-
-Yes.
-
-= Can I use this plugin with Sendinblue SMTP? =
-
-Yes.
-
-= Can I use this plugin with Mailgun SMTP? =
-
-Yes.
-
-= Can I use this plugin with SendGrid SMTP? =
-
-Yes.
-
-= Can I use this plugin with Postmark SMTP? =
-
-Yes.
-
-= Can I use this plugin with Office365 SMTP? =
-
-Yes.
-
-= Can I use this plugin with ZohoMail SMTP? =
-
-Yes.
+none
== Screenshots ==
@@ -103,6 +68,12 @@ none
== Changelog ==
+= 1.1.11 =
+* WordPress 6.4 compatibility update.
+
+= 1.1.10 =
+* Added an option to set the configured from address for all outgoing email messages.
+
= 1.1.9 =
* Additional check for the settings link.