- Updates Sending Queue worker/tasks/unit tests use model's method to get/save rendered newsletter body

This commit is contained in:
Vlad
2016-09-19 20:11:58 -04:00
parent e1caf49ea5
commit 1bf0988297
7 changed files with 54 additions and 65 deletions

View File

@@ -7,23 +7,22 @@ use MailPoet\Util\Helpers;
if(!defined('ABSPATH')) exit;
class Links {
static function process($newsletter, $queue) {
list($rendered_body, $links) =
self::hashAndReplaceLinks($newsletter->_transient->rendered_body);
static function process($rendered_newsletter, $newsletter, $queue) {
list($rendered_newsletter, $links) =
self::hashAndReplaceLinks($rendered_newsletter);
self::saveLinks($links, $newsletter, $queue);
$newsletter->_transient->rendered_body = $rendered_body;
return $newsletter;
return $rendered_newsletter;
}
static function hashAndReplaceLinks($newsletter_rendered_body) {
static function hashAndReplaceLinks($rendered_newsletter) {
// join HTML and TEXT rendered body into a text string
$content = Helpers::joinObject($newsletter_rendered_body);
$content = Helpers::joinObject($rendered_newsletter);
list($content, $links) = NewsletterLinks::process($content);
// split the processed body with hashed links back to HTML and TEXT
list($newsletter_rendered_body['html'], $newsletter_rendered_body['text'])
list($rendered_newsletter['html'], $rendered_newsletter['text'])
= Helpers::splitObject($content);
return array(
$newsletter_rendered_body,
$rendered_newsletter,
$links
);
}