From fd2e5d66e75dd4766c276d5b07ce3ddc58875c75 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Fri, 20 Mar 2015 12:32:26 +0000
Subject: [PATCH] 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
---
 wp-includes/formatting.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 6a259069d1..a75af2ee99 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -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;
 }