wpMandrill - Version 1.26

Version Description

  • UPDATED: Now Mandrill accepts any content type and so does wpMandrill.
  • FIXED: Queued messages were triggering the native wp_mail function. ** Thanks Scott Connerly! **
Download this release

Release Info

Developer MC_Will
Plugin Icon wp plugin wpMandrill
Version 1.26
Comparing to
See all releases

Code changes from version 1.25 to 1.26

Files changed (3) hide show
  1. lib/mandrill.class.php +2 -7
  2. readme.txt +4 -0
  3. wpmandrill.php +2 -2
lib/mandrill.class.php CHANGED
@@ -560,13 +560,8 @@ class Mandrill {
560
}
561
562
static function isValidContentType($ct) {
563
- $valids = self::getValidContentTypes();
564
-
565
- foreach ( $valids as $vct ) {
566
- if ( strpos($ct, $vct) !== false ) return true;
567
- }
568
-
569
- return false;
570
}
571
572
static function getValidContentTypes() {
560
}
561
562
static function isValidContentType($ct) {
563
+ // Now Mandrill accepts any content type.
564
+ return true;
565
}
566
567
static function getValidContentTypes() {
readme.txt CHANGED
@@ -92,6 +92,10 @@ If your account has more than 20 senders registered or more than 40 tags used, t
92
93
== Changelog ==
94
95
= 1.25 =
96
* FIXED: Undefined WPDOMAIN constant in stats.php
97
92
93
== Changelog ==
94
95
+ = 1.26 =
96
+ * UPDATED: Now Mandrill accepts any content type and so does wpMandrill.
97
+ * FIXED: Queued messages were triggering the native wp_mail function. ** Thanks Scott Connerly! **
98
+
99
= 1.25 =
100
* FIXED: Undefined WPDOMAIN constant in stats.php
101
wpmandrill.php CHANGED
@@ -5,7 +5,7 @@ Description: wpMandrill sends emails, generated by WordPress using Mandrill.
5
Author: Mandrill
6
Author URI: http://mandrillapp.com/
7
Plugin URI: http://connect.mailchimp.com/integrations/wpmandrill
8
- Version: 1.25
9
Text Domain: wpmandrill
10
*/
11
/* Copyright 2012 MailChimp (email : will@mailchimp.com )
@@ -67,7 +67,7 @@ class wpMandrill {
67
68
if ( is_wp_error($sent)
69
|| !isset($sent[0]['status'])
70
- || $sent[0]['status'] != 'sent' ) {
71
72
return wpMandrill::wp_mail_native( $to, $subject, $message, $headers, $attachments );
73
}
5
Author: Mandrill
6
Author URI: http://mandrillapp.com/
7
Plugin URI: http://connect.mailchimp.com/integrations/wpmandrill
8
+ Version: 1.26
9
Text Domain: wpmandrill
10
*/
11
/* Copyright 2012 MailChimp (email : will@mailchimp.com )
67
68
if ( is_wp_error($sent)
69
|| !isset($sent[0]['status'])
70
+ || ($sent[0]['status'] != 'sent' && $sent[0]['status'] != 'queued') ) {
71
72
return wpMandrill::wp_mail_native( $to, $subject, $message, $headers, $attachments );
73
}