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
*/