Skip to content

Commit

Permalink
Version 1.2.7; reverted commit 3fba9d6 (no longer needed)
Browse files Browse the repository at this point in the history
  • Loading branch information
MillerMedia committed Feb 15, 2020
1 parent 4aff9af commit 53c0a7a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
17 changes: 0 additions & 17 deletions lib/wpMandrill.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -196,22 +195,6 @@ static function adminNotices() {
if ( self::$conflict ) {
echo '<div class="error"><p>'.__('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') . '</p></div>';
}

$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 '<div class="notice notice-info">' .
'<p>' . __(
'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.<br /><br />' .
'Read more here: <a href="https://www.millermedia.io/mandrill-outage-details-and-actions/" target="_blank" rel="noopener">Mandrill Outage Details and Actions</a>.',
'wpmandrill') . '</p>' .
'</div>';
}
}

static function showAdminEnqueueScripts($hook_suffix) {
Expand Down
7 changes: 5 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion wpmandrill.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Description: Send e-mails using Mandrill. This is a forked version of the now unsupported plugin <a href="https://wordpress.org/plugins/wpmandrill/">wpMandrill</a>.
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
*/
Expand Down

0 comments on commit 53c0a7a

Please sign in to comment.