Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fixes newsletter body being incorrectly saved

Browse Source
This commit is contained in:
Vlad
2018-01-08 22:48:57 -05:00
committed by pavel-mailpoet
parent 4018ca4a65
commit a45a7a7616
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Models/SendingQueue.php
View File

@ -54,6 +54,7 @@ class SendingQueue extends Model {
}
function save() {
$this->newsletter_rendered_body = $this->getNewsletterRenderedBody();
if(!is_serialized($this->subscribers) && !is_null($this->subscribers)) {
$this->set('subscribers', serialize($this->subscribers));
}

21
tests/unit/Models/SendingQueueTest.php
View File

@ -74,6 +74,27 @@ class SendingQueueTest extends \MailPoetTest {
expect(json_decode($queue->newsletter_rendered_body, true))->equals($data);
}
function testItReencodesSerializedObjectToJsonEncoded() {
$queue = $this->queue;
$newsletter_rendered_body = $this->rendered_body;
// update queue with a serialized rendered newsletter body
\ORM::rawExecute(
'UPDATE `' . SendingQueue::$_table . '` SET `newsletter_rendered_body` = ? WHERE `id` = ?',
array(
serialize($newsletter_rendered_body),
$queue->id
)
);
$sending_queue = SendingQueue::findOne($queue->id);
expect($sending_queue->newsletter_rendered_body)->equals(serialize($newsletter_rendered_body));
// re-saving the queue will re-rencode the body using json_encode()
$sending_queue->save();
$sending_queue = SendingQueue::findOne($queue->id);
expect($sending_queue->newsletter_rendered_body)->equals(json_encode($newsletter_rendered_body));
}
function _after() {
Mock::clean();
\ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);