Skip to content

Commit

Permalink
Merge pull request #345 from mailjet/DE-949-double-opt-in-with-contac…
Browse files Browse the repository at this point in the history
…t-form-7

Fixed error with Double opt-in and CF7 plugin
  • Loading branch information
oleksandr-mykhailenko authored Jan 30, 2023
2 parents 2366475 + fdc4c65 commit 96bd08c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
- Requires at least: 4.4
- Tested up to: 6.1.1
- Stable tag: 5.3.5
- Stable tag: 5.3.6
- Requires PHP: 5.6
- License: GPLv2 or later
- License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -205,6 +205,8 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
7. Configure abandoned cart notifications for WooCommerce

## Changelog
##### 5.3.6
* Fixed error with Double opt-in and CF7 plugin

##### 5.3.5
* Fixed error when new user in WP was unsubscribed in the contact list
Expand Down
4 changes: 3 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Contributors: Mailjet
Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
Requires at least: 4.4
Tested up to: 6.1.1
Stable tag: 5.3.5
Stable tag: 5.3.6
Requires PHP: 5.6
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -196,6 +196,8 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
7. Configure abandoned cart notifications for WooCommerce

== Upgrade notice ==
= 5.3.6 =
* Fixed error with Double opt-in and CF7 plugin

= 5.3.5 =
* Fixed error when new user in WP was unsubscribed in the contact list
Expand Down
2 changes: 1 addition & 1 deletion src/includes/SettingsPages/ContactForm7Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function sendConfirmationEmail($contactForm): bool
$contact['Properties']['name'] = $formdata[$cf7name];
MailjetApi::createMailjetContactProperty('name');
}
MailjetApi::syncMailjetContact($mailjetCF7List, $contact);
MailjetApi::syncMailjetContact($mailjetCF7List, $contact, 'unsub');
$email_subject = Mailjeti18n::getTranslationsFromFile($locale, 'Subscription Confirmation');
add_filter('wp_mail_content_type', array(SubscriptionOptionsSettings::getInstance(), 'set_html_content_type'));
wp_mail($email, $email_subject, $message, array('From: ' . get_option('blogname') . ' <' . get_option('admin_email') . '>'));
Expand Down
2 changes: 1 addition & 1 deletion src/includes/SettingsPages/IntegrationsSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ public function mailjet_integrations_page_html()
<div class="right">
<?php
if ($post_update) {
echo esc_attr($this->displayMessage($post_update));
echo wp_kses_data($this->displayMessage($post_update));
}
?>
<div class="centered">
Expand Down
4 changes: 2 additions & 2 deletions wp-mailjet.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Plugin Name: Mailjet for WordPress
* Plugin URI: https://www.mailjet.com/partners/wordpress/
* Description: The Best WordPress Plugin For Email Newsletters.
* Version: 5.3.5
* Version: 5.3.6
* Tested up to: 6.1.1
* Author: Mailjet SAS
* Author URI: http://mailjet.com
Expand Down Expand Up @@ -55,7 +55,7 @@
/**
* Mailjet plugin version.
*/
define('MAILJET_VERSION', '5.3.5');
define('MAILJET_VERSION', '5.3.6');

/**
* Mailjet Plugid dir.
Expand Down

0 comments on commit 96bd08c

Please sign in to comment.