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

Fix browser preview bypassing emoji encoding [MAILPOET-1009]

Browse Source
This commit is contained in:
stoletniy
2017-08-30 14:39:38 +03:00
parent 61ae2da1e3
commit 53f7953566
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Models/Newsletter.php
View File

@ -80,11 +80,15 @@ class Newsletter extends Model {
$this->set_expr('deleted_at', 'NULL');
}
$this->set('body',
is_array($this->body)
? json_encode($this->body)
: $this->body
);
if(isset($this->body)) {
if(is_array($this->body)) {
$this->body = json_encode($this->body);
}
$this->set(
'body',
Emoji::encodeForUTF8Column(self::$_table, 'body', $this->body)
);
}
$this->set('hash',
($this->hash)
@ -795,10 +799,6 @@ class Newsletter extends Model {
$newsletter = self::findOne((int)$data['id']);
}
if(!empty($data['body'])) {
$data['body'] = Emoji::encodeForUTF8Column(self::$_table, 'body', $data['body']);
}
if($newsletter === false) {
$newsletter = self::create();