Merge pull request #86 from sailthru/IN-1659-Wordpress_5.5

[IN-1659] Add work-around for Wordpress 5.5
sailthru · Oct 15, 2020 · 0a6bdfa · 0a6bdfa
2 parents 8dcbe63 + fe8bd72
commit 0a6bdfa
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/README.txt b/README.txt
@@ -1,15 +1,15 @@
 === Sailthru for WordPress ===
-Contributors: brownac, lcooper, asilverman, nickgundry, sailthru-wp, automattic, irms, zackify, natebot
+Contributors: sailthru-wp
 Tags: personalization, email,
-Requires at least: 3.6
-Tested up to: 5.4
-Stable tag: 3.6.1
+Requires at least: 5.5
+Tested up to: 5.5.1
+Stable tag: 4.0.0
 
-This plugin  provides fast and easy integration of the core Sailthru features into your Wordpress site.
+Provides an integration with Sailthru
 
 == Description ==
 
-Provides an integration with Sailthru
+This plugin provides fast and easy integration of the core Sailthru features into your Wordpress site.
 
 == Installation ==
 
@@ -22,3 +22,10 @@ http://docs.sailthru.com/integrations/wordpress
 3. Configure Sailthru's Concierge widget in the WordPress admin. No JavaScript knowledge needed.
 4. Configure Scout in the WordPress admin.
 5. Add customizable fields to the Signup widget
+
+
+== Upgrade Notice ==
+
+= v4.0.0 =
+This version supports Wordpress version 5.5 and isn't backwards compatible with older Wordpress versions.
+Only upgrade if using Wordpress version 5.5 or greater.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v4.0.0 (2020-10-14)
+Supports Wordpress version 5.5.
+This version isn't backwards compatible with older Wordpress versions.
+
 ## v3.6.1 (2020-10-14)
 Fixed bug where double opt-in option adds users to list immediately
 

diff --git a/classes/class-sailthru-mailer.php b/classes/class-sailthru-mailer.php
@@ -1,7 +1,12 @@
 <?php
 
-require_once ABSPATH . WPINC . '/class-phpmailer.php';
-require_once ABSPATH . WPINC . '/class-smtp.php';
+// Work-around for 5.5
+use PHPMailer\PHPMailer\PHPMailer;
+
+require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php';
+require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
+require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php';
+// End work-around for 5.5
 
 
 class SailthruMailer extends PHPMailer {

diff --git a/plugin.php b/plugin.php
@@ -1,12 +1,13 @@
 <?php
 /**
-Plugin Name: Sailthru for WordPress
-Plugin URI: http://sailthru.com/
-Description: Add the power of Sailthru to your WordPress set up.
-Version: 3.6.1
-Author: Sailthru
-Author URI: http://sailthru.com
-Author Email: [email protected]
+Plugin Name:        Sailthru for WordPress
+Plugin URI:         http://sailthru.com/
+Description:        Add the power of Sailthru to your WordPress set up.
+Version:            4.0.0
+Requires at least:  5.5
+Author:             Sailthru
+Author URI:         http://sailthru.com
+Author Email:       [email protected]
 License:
 
 Copyright 2013 (Sailthru)
@@ -35,7 +36,7 @@
  * @var   const    $version    The current version of the plugin.
  */
 if ( ! defined( 'SAILTHRU_PLUGIN_VERSION' ) ) {
-	define( 'SAILTHRU_PLUGIN_VERSION', '3.6.1' );
+	define( 'SAILTHRU_PLUGIN_VERSION', '4.0.0' );
 }
 
 if ( ! defined( 'SAILTHRU_PLUGIN_PATH' ) ) {