Changeset 1597499

Timestamp:

02/16/2017 07:09:23 PM (9 years ago)

Author:

sparkpost

Message:

Release v2.6.4

Location:

sparkpost/trunk

Files:

• admin.widget.class.php (modified) (2 diffs)
• docs/templates-attachments.md (added)
• mailer.http.class.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• sample.txt (added)
• tests/specs/test-mailer.http.class.php (modified) (3 diffs)
• wordpress-sparkpost.php (modified) (2 diffs)

sparkpost/trunk/admin.widget.class.php

@@ -52 +52 @@
     {
         add_filter('wp_mail_content_type', array($this, 'set_html_content_type'));
+        $headers = array();
+        $attachments= array(__DIR__ . '/sample.txt');
         $result = wp_mail($recipient,
             'SparkPost email test',
             '<h3>Hurray!!</h3><p>You\'ve got mail! <br/><br> Regards,<br/><a href="https://www.sparkpost.com">SparkPost</a> WordPress plugin</p>',
-            ''
+            $headers,
+            $attachments
         );
         remove_filter('wp_mail_content_type', array($this, 'set_html_content_type'));
@@ -243 +246 @@
         <small>
             <ul>
-                <li>- Please see <a href="https://support.sparkpost.com/customer/portal/articles/2409547-using-templates-with-the-sparkpost-wordpress-plugin">this article</a> for detailed information about using templates with this plugin.</li>
+                <li>- Please see <a href="https://support.sparkpost.com/customer/portal/articles/2409547-using-templates-with-the-sparkpost-wordpress-plugin" target="_blank">this article</a> for detailed information about using templates with this plugin.</li>
                 <li>- Templates can only be used with the HTTP API.</li>
-                <li>- Leave this field blank to disable use of a template.</li>
+                <li>- <a href="https://github.com/SparkPost/wordpress-sparkpost/blob/master/docs/templates-attachments.md" target="_blank">Does not work with attachment.</a>
+                <li>- Leave this field blank to disable use of a template. You can still specify it by <a href="https://github.com/SparkPost/wordpress-sparkpost/blob/master/docs/hooks.md" target="_blank">using hooks</a>.</li>
             </ul>
         </small>

sparkpost/trunk/mailer.http.class.php

@@ -87 +87 @@
         );
 
+        $template_id = apply_filters('wpsp_template_id', $this->settings['template']);
+
         // pass through either stored template or inline content
-        if (!empty($this->settings['template'])) {
+        if (!empty($template_id)) { 
             // stored template
-            $body['content']['template_id'] = apply_filters('wpsp_template_id', $this->settings['template']);
+            $body['content']['template_id'] = $template_id;
 
             // supply substitution data so users can add variables to templates
@@ -96 +98 @@
             $body['substitution_data']['subject'] = $this->Subject;
             $body['substitution_data']['from_name'] = $sender['name'];
-            $body['substitution_data']['from'] = $sender['name'] . ' <' . $sender['email'] . '>';
+            $body['substitution_data']['from'] = $sender['email'];
             if ($replyTo) {
                 $body['substitution_data']['reply_to'] = $replyTo;

sparkpost/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.3
 Tested up to: 4.7.2
-Stable tag: 2.6.3
+Stable tag: 2.6.4
 License: GPLv2 or later
 
@@ -47 +47 @@
 
 == Changelog ==
+= 2.6.4 =
+- Fix the issue to use template hook when not set in settings ([#95](https://github.com/SparkPost/wordpress-sparkpost/issues/95))
+- Clarify attachment can't be sent with template and include workaround example ([#96](https://github.com/SparkPost/wordpress-sparkpost/issues/96))
+- Include attachment in test email
+
 = 2.6.3 =
 - Add plugin name to XMailer (for SMTP)
@@ -120 +125 @@
 == Upgrade Notice ==
 
-From WordPress plugins list, click `update now`. 
+From WordPress plugins list, click `update now`.

sparkpost/trunk/tests/specs/test-mailer.http.class.php

@@ -204 +204 @@
     NSA::setProperty($this->mailer, 'settings', [
       'enable_tracking' => true,
-      'transactional' => false
+      'transactional' => false,
+      'template' => ''
     ]);
 
@@ -260 +261 @@
   }
 
+  function test_get_request_body_template_in_hook_but_not_in_settings() {
+    $this->mailer->addAddress('[email protected]', 'abc');
+    $this->mailer->setFrom( '[email protected]', 'me');
+
+    $callback = function(){
+      return 'test-template'; 
+    };
+
+    add_filter('wpsp_template_id', $callback);
+
+    NSA::setProperty($this->mailer, 'settings', [
+      'enable_tracking' => true,
+      'transactional' => false,
+      'template' => ''
+    ]);
+
+    $body = NSA::invokeMethod($this->mailer, 'get_request_body');
+    remove_filter('wpsp_template_id', $callback);
+    $this->assertTrue($body['content']['template_id'] == 'test-template');
+  }
+
   function test_get_request_body_with_template() {
     $this->mailer->addAddress('[email protected]', 'abc');
@@ -305 +327 @@
         'subject' => '',
         'from_name' => 'me',
-        'from' => 'me <[email protected]>',
+        'from' => 'me@hello.com',
         'from_localpart'  => 'me'
       ]

sparkpost/trunk/wordpress-sparkpost.php

@@ -5 +5 @@
 Plugin URI: http://sparkpost.com/
 Description: Send all your email from Wordpress through SparkPost, the world's most advanced email delivery service.
-Version: 2.6.3
+Version: 2.6.4
 Author: SparkPost
 Author URI: http://sparkpost.com
@@ -18 +18 @@
 define('WPSP_PLUGIN_DIR', plugin_dir_path(__FILE__));
 define('WPSP_PLUGIN_PATH', WPSP_PLUGIN_DIR . basename(__FILE__));
-define('WPSP_PLUGIN_VERSION', '2.6.3');
+define('WPSP_PLUGIN_VERSION', '2.6.4');
 
 require_once(WPSP_PLUGIN_DIR . 'sparkpost.class.php');