Skip to content

Commit

Permalink
Merge pull request #111 from ActiveCampaign/1.19.1-stable
Browse files Browse the repository at this point in the history
v1.19.1 stable
  • Loading branch information
pgraham3 authored Dec 7, 2023
2 parents e041462 + 902c6f8 commit aa523b7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ The plugin supports using the `wp_mail_from_name` filter for manually setting a
[Can I use the ActiveCampaign Postmark for WordPress plugin with Divi contact forms?](https://postmarkapp.com/support/article/1128-can-i-use-the-postmark-for-wordpress-plugin-with-divi-contact-forms)

## Changelog
## [1.20.0]
- Convert newlines to line breaks when forcing HTML
## [1.19.1]
- Fix warning when logging sends with a null To address

--------

Expand Down
4 changes: 2 additions & 2 deletions postmark.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: ActiveCampaign Postmark (Official)
* Plugin URI: https://postmarkapp.com/
* Description: Overrides wp_mail to send emails through ActiveCampaign Postmark
* Version: 1.20.0
* Version: 1.19.1
* Requires PHP: 7.0
* Requires at least: 5.3
* Tested up to: 6.4
Expand Down Expand Up @@ -41,7 +41,7 @@ class Postmark_Mail {
*
* @var string
*/
public static $POSTMARK_VERSION = '1.20.0';
public static $POSTMARK_VERSION = '1.19.1';

/**
* ActiveCampaign Postmark Plugin Directory.
Expand Down
6 changes: 3 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: postmark, email, smtp, notifications, wp_mail, wildbit
Requires PHP: 7.0
Requires at least: 5.3
Tested up to: 6.4
Stable tag: 1.20.0
Stable tag: 1.19.1

The *officially-supported* ActiveCampaign Postmark plugin for Wordpress.

Expand Down Expand Up @@ -133,8 +133,8 @@ At [ActiveCampaign](https://www.activecampaign.com/?utm_source=postmark&utm_medi
1. ActiveCampaign Postmark WP Plugin Settings screen.

== Changelog ==
= v1.20.0 =
* Convert newlines to line breaks when forcing HTML
= v1.19.1 =
* Fix warning when logging sends with a null To address

--------

Expand Down
4 changes: 0 additions & 4 deletions wp-mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,6 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
}

if ( 1 === (int) $settings['force_html'] || 'text/html' === $content_type || 1 === $track_opens ) {
# convert "/n" newlines in plain text to <br> tags in forced HTML
if ( 'text/plain' === $content_type ) {
$message = str_replace( "\n", "<br>", $message );
}
$body['HtmlBody'] = $message;
// The user really, truly wants this sent as HTML, don't send it as text, too.
// For historical reasons, we can't "force html" and "track opens" set both html and text bodies,
Expand Down

0 comments on commit aa523b7

Please sign in to comment.