From 53c0a7a52dbd8c62c62f36d40dd61ff0cb6103ca Mon Sep 17 00:00:00 2001 From: Matt Miller Date: Sat, 15 Feb 2020 02:01:52 -0800 Subject: [PATCH 1/4] Version 1.2.7; reverted commit 3fba9d6fc1ad43da2499ce432fcdc8b2b531fd6e (no longer needed) --- lib/wpMandrill.class.php | 17 ----------------- readme.txt | 7 +++++-- wpmandrill.php | 2 +- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/wpMandrill.class.php b/lib/wpMandrill.class.php index 5021952..2c773c3 100644 --- a/lib/wpMandrill.class.php +++ b/lib/wpMandrill.class.php @@ -18,7 +18,6 @@ static function on_load() { add_action('admin_init', array(__CLASS__, 'adminInit')); add_action('admin_menu', array(__CLASS__, 'adminMenu')); - add_action('admin_notices', array(__CLASS__, 'adminNotices')); add_filter('contextual_help', array(__CLASS__, 'showContextualHelp'), 10, 3); @@ -196,22 +195,6 @@ static function adminNotices() { if ( self::$conflict ) { echo '

'.__('Mandrill: wp_mail has been declared by another process or plugin, so you won\'t be able to use Mandrill until the problem is solved.', 'wpmandrill') . '

'; } - - $et_timezone = new DateTimeZone( 'America/New_York' ); - $now = date_create( 'now', $et_timezone ); - $until = date_create( '2020-01-12 00:00:00', $et_timezone ); - - if ( $now < $until ) { - echo '
' . - '

' . __( - 'On Saturday, January 11th from 1am - 7am EST, the Mandrill email service will be upgrading its infrastructure ' . - 'and all emails sent through their service will fail. The \'Send Emails with Mandrill\' plugin is currently configured ' . - 'to send mail through your normal WordPress server without any additional configuration. As a precaution, we have ' . - 'posted a blog detailing additional details actions you can take as precautions during this outage.

' . - 'Read more here: Mandrill Outage Details and Actions.', - 'wpmandrill') . '

' . - '
'; - } } static function showAdminEnqueueScripts($hook_suffix) { diff --git a/readme.txt b/readme.txt index a01d819..0c3775e 100644 --- a/readme.txt +++ b/readme.txt @@ -3,8 +3,8 @@ Contributors: MillerMediaNow, mikemm01, MC_Will, MC_Amanda, cornelraiu-1, crstau Tags: mandrill, mailchimp, transactional email, email, email reliability, smtp, wp_mail, email templates Requires PHP: 5.6 Requires at least: 3.0 -Tested up to: 5.3 -Stable tag: 1.2.6 +Tested up to: 5.3.2 +Stable tag: 1.2.7 License: GPLv2 The Send Emails with Mandrill plugin sends emails that are generated by WordPress through Mandrill, a transactional email service powered by MailChimp. @@ -108,6 +108,9 @@ If your account has more than 20 senders registered or more than 40 tags used, t 4. Dashboard widget Settings == Changelog == += 1.2.7 = +* Removed code added for previous Mandrill outage + = 1.2.6 = * Updated messaging on how to handle the upcoming Mandrill outage * Bug fix for memcache overload when loading Mandrill reports page on high traffic sites diff --git a/wpmandrill.php b/wpmandrill.php index d175f19..67c26c6 100644 --- a/wpmandrill.php +++ b/wpmandrill.php @@ -4,7 +4,7 @@ Description: Send e-mails using Mandrill. This is a forked version of the now unsupported plugin wpMandrill. Author: Miller Media ( Matt Miller ) Author URI: http://www.millermedia.io -Version: 1.2.6 +Version: 1.2.7 Requires PHP: 5.6 Text Domain: send-emails-with-mandrill */ From 5d34ad382c3566815b8bda22b6ae74945280abd7 Mon Sep 17 00:00:00 2001 From: Matt Miller Date: Thu, 5 Mar 2020 17:40:16 -0800 Subject: [PATCH 2/4] Version 1.2.8 --- readme.txt | 5 ++++- wpmandrill.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/readme.txt b/readme.txt index 0c3775e..664ae88 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: mandrill, mailchimp, transactional email, email, email reliability, smtp, Requires PHP: 5.6 Requires at least: 3.0 Tested up to: 5.3.2 -Stable tag: 1.2.7 +Stable tag: 1.2.8 License: GPLv2 The Send Emails with Mandrill plugin sends emails that are generated by WordPress through Mandrill, a transactional email service powered by MailChimp. @@ -108,6 +108,9 @@ If your account has more than 20 senders registered or more than 40 tags used, t 4. Dashboard widget Settings == Changelog == += 1.2.8 = +* Add wpmandrill_enable_reports and wpmandrill_enable_widgets filters to programmatically disable the reports dashboard and widget if desired. + = 1.2.7 = * Removed code added for previous Mandrill outage diff --git a/wpmandrill.php b/wpmandrill.php index 67c26c6..b2b9316 100644 --- a/wpmandrill.php +++ b/wpmandrill.php @@ -4,7 +4,7 @@ Description: Send e-mails using Mandrill. This is a forked version of the now unsupported plugin wpMandrill. Author: Miller Media ( Matt Miller ) Author URI: http://www.millermedia.io -Version: 1.2.7 +Version: 1.2.8 Requires PHP: 5.6 Text Domain: send-emails-with-mandrill */ From ab75d113c336d092ceba249e7b8ee7152f5f488a Mon Sep 17 00:00:00 2001 From: Matt Miller Date: Thu, 5 Mar 2020 17:41:51 -0800 Subject: [PATCH 3/4] Version 1.2.8 - readme update --- readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.txt b/readme.txt index 664ae88..3b287ba 100644 --- a/readme.txt +++ b/readme.txt @@ -11,6 +11,8 @@ The Send Emails with Mandrill plugin sends emails that are generated by WordPres == Description == +**Did you find this plugin helpful?** Please consider [leaving a 5-star review](https://wordpress.org/support/view/plugin-reviews/send-emails-with-mandrill/). + Note: This is a forked version of the now unsupported wpMandrill plugin. The notes below are copied over from the original plugin and will be updated as relevant updates become available. Please help by contributing to the GitHub repository [Send Emails With Mandrill on GitHub](https://github.com/Miller-Media/send-emails-with-mandrill) This plugin uses [Mandrill API](http://mandrillapp.com/api/docs/) to send outgoing emails, with or without attachments, from your Wordpress installation. It replaces the wp_mail function included with WordPress. From 88074cdbb935119213a6bdd37c29ccdc63a5db45 Mon Sep 17 00:00:00 2001 From: Matt Miller Date: Thu, 5 Mar 2020 17:45:49 -0800 Subject: [PATCH 4/4] Added @srumery as a contributor --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 3b287ba..fcdf051 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ === Send Emails with Mandrill === -Contributors: MillerMediaNow, mikemm01, MC_Will, MC_Amanda, cornelraiu-1, crstauf, bizmatebiz, andrewhilson, anthonywnz +Contributors: MillerMediaNow, mikemm01, MC_Will, MC_Amanda, cornelraiu-1, crstauf, bizmatebiz, andrewhilson, anthonywnz, srumery Tags: mandrill, mailchimp, transactional email, email, email reliability, smtp, wp_mail, email templates Requires PHP: 5.6 Requires at least: 3.0