Uses json_encode() instead of serialize() to save rendered newsletter

body
This commit is contained in:
Vlad
2017-12-20 20:45:53 -05:00
parent 8852f6a3f4
commit cb430673f8
4 changed files with 64 additions and 9 deletions

View File

@ -2,6 +2,8 @@
namespace MailPoet\Models;
use MailPoet\Util\Helpers;
if(!defined('ABSPATH')) exit;
class ModelValidator extends \Sudzy\Engine {
@ -35,9 +37,11 @@ class ModelValidator extends \Sudzy\Engine {
}
function validateRenderedNewsletterBody($newsletter_body) {
$newsletter_body = (!is_serialized($newsletter_body)) ?
$newsletter_body :
unserialize($newsletter_body);
if(is_serialized($newsletter_body)) {
$newsletter_body = unserialize($newsletter_body);
} else if(Helpers::isJson($newsletter_body)) {
$newsletter_body = json_decode($newsletter_body, true);
}
return (is_null($newsletter_body) || (is_array($newsletter_body) && !empty($newsletter_body['html']) && !empty($newsletter_body['text'])));
}
}