Merge pull request #69 from Miller-Media/develop

Develop

lib/wpMandrill.class.php

@@ -770,7 +770,7 @@ static function asknl2br() {
         <span class="setting-description">
 	        	<em>
 	        		<?php _e('<small>If you are sending HTML emails already keep this setting deactivated.<br/>But if you are sending text only emails (WordPress default) this option might help your emails look better.</small>', 'wpmandrill'); ?><br/>
-                    <?php _e('<small>You can change the value of this setting on the fly by using the <strong><a href="#" onclick="jQuery(\'a#contextual-help-link\').trigger(\'click\');return false;">wpmandrill_nl2br</a></strong> filter.</small>', 'wpmandrill'); ?>
+                    <?php _e('<small>You can change the value of this setting on the fly by using the <strong><a href="#" onclick="jQuery(\'a#contextual-help-link\').trigger(\'click\');return false;">mandrill_nl2br</a></strong> filter.</small>', 'wpmandrill'); ?>
 	        	</em></span>
         </div><?php
     }
@@ -1911,14 +1911,15 @@ function wpMandrill_transformJSArray(&$value, $key, $params = 0) {
     if ( is_array($params) ) {
         $format 	= isset($params[0]) ? $params[0] : 0;
         $day_keys 	= isset($params[1]) ? $params[1] : array();
-    }
-    switch ( $format ) {
-        case 0:
-            $value = "[$key,$value]";
-            break;
-        case 1:
-            $key = array_search($key,$day_keys);
-            $value = "[$key,$value]";
-            break;
+
+        switch ( $format ) {
+            case 0:
+                $value = "[$key,$value]";
+                break;
+            case 1:
+                $key = array_search($key,$day_keys);
+                $value = "[$key,$value]";
+                break;
+        }
     }
 }

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.4.1
-Stable tag: 1.2.9
+Tested up to: 5.5
+Stable tag: 1.2.10
 License: GPLv2
 
 The Send Emails with Mandrill plugin sends emails that are generated by WordPress through Mandrill, a transactional email service powered by MailChimp.

wpmandrill.php

@@ -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.9
+Version: 1.2.10
 Requires PHP: 5.6
 Text Domain: send-emails-with-mandrill
 */