From b4c8fe6f453abf8082df60ca87e774182d01d72a Mon Sep 17 00:00:00 2001
From: Vlad <vlad@mailpoet.com>
Date: Tue, 26 Jan 2016 10:44:18 -0500
Subject: [PATCH] - Updates newsletter router and sending queue worker to work
 with the   shortcodes implementation

---
 lib/Cron/Workers/SendingQueue.php |  6 ++++--
 lib/Router/Newsletters.php        | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/Cron/Workers/SendingQueue.php b/lib/Cron/Workers/SendingQueue.php
index a996c46c27..0299f769c3 100644
--- a/lib/Cron/Workers/SendingQueue.php
+++ b/lib/Cron/Workers/SendingQueue.php
@@ -53,8 +53,10 @@ class SendingQueue {
 
   function processNewsletter($newsletter, $subscriber) {
     $rendered_newsletter = $this->renderNewsletter($newsletter);
-    $shortcodes = new Shortcodes($rendered_newsletter, $newsletter, $subscriber);
-    $processed_newsletter = $shortcodes->replace();
+    $shortcodes = new Shortcodes($rendered_newsletter['html'], $newsletter, $subscriber);
+    $processed_newsletter['html'] = $shortcodes->replace();
+    $shortcodes->rendered_newsletter = $rendered_newsletter['text'];
+    $processed_newsletter['text'] = $shortcodes->replace();
     return $processed_newsletter;
   }
 
diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php
index 7956d16f6a..f976694dd3 100644
--- a/lib/Router/Newsletters.php
+++ b/lib/Router/Newsletters.php
@@ -214,13 +214,13 @@ class Newsletters {
       wp_send_json(false);
     }
     $renderer = new Renderer($data);
-    $rendered_body = $renderer->render();
+    $rendered_newsletter = $renderer->render();
     $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
-      $rendered_body,
+      $rendered_newsletter['html'],
       $data
     );
-    $rendered_body = $shortcodes->replace();
-    wp_send_json(array('rendered_body' => $rendered_body));
+    $rendered_newsletter = $shortcodes->replace();
+    wp_send_json(array('rendered_body' => $rendered_newsletter));
   }
 
   function sendPreview($data = array()) {
@@ -242,15 +242,17 @@ class Newsletters {
     $newsletter = $newsletter->asArray();
 
     $renderer = new Renderer($newsletter);
-    $rendered_body = $renderer->render();
+    $rendered_newsletter = $renderer->render();
     $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
-      $rendered_body,
+      $rendered_newsletter['html'],
       $newsletter
     );
-    $rendered_body = $shortcodes->replace();
+    $processed_newsletter['html'] = $shortcodes->replace();
+    $shortcodes->rendered_newsletter = $rendered_newsletter['text'];
+    $processed_newsletter['text'] = $shortcodes->replace();
     $newsletter['body'] = array(
-      'html' => $rendered_body,
-      'text' => '',
+      'html' => $processed_newsletter['html'],
+      'text' => $processed_newsletter['text'],
     );
 
     try {