Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

When converting emoji in email to static images, check that the message is defined, otherwise we could cause PHP warnings. 

Props nerrad.

Fixes #31708.



Built from https://develop.svn.wordpress.org/trunk@31847


git-svn-id: http://core.svn.wordpress.org/trunk@31827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-03-20 12:32:26 +00:00
parent 42b9557137
commit fd2e5d66e7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/formatting.php
View File

@ -4199,6 +4199,8 @@ function wp_staticize_emoji( $text ) {
* @return array The email data array, with emoji in the message staticized.
*/
function _wp_staticize_emoji_for_email( $mail ) {
$mail['message'] = wp_staticize_emoji( $mail['message'], true );
if ( isset( $mail['message'] ) ) {
$mail['message'] = wp_staticize_emoji( $mail['message'], true );
}
return $mail;
}