From dcfb3532c12960219f1457aaf66cac3295660ed8 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Thu, 9 Apr 2015 04:36:57 +0000 Subject: [PATCH] Emoji: Tidy up the `wp_encode_emoji()` regex, and clarify the function comment on Unicode 8 support. git-svn-id: https://develop.svn.wordpress.org/trunk@32096 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/formatting.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php index 7003f8d0dc..3fc538a1bc 100644 --- a/src/wp-includes/formatting.php +++ b/src/wp-includes/formatting.php @@ -4178,8 +4178,8 @@ function print_emoji_detection_script() { /** * Convert any 4 byte emoji in a string to their equivalent HTML entity. * - * Currently, only Unicode 7 emoji are supported. Unicode 8 emoji will be added - * when the spec in finalised, along with the new skin-tone modifiers. + * Currently, only Unicode 7 emoji are supported. Skin tone modifiers are allowed, + * all other Unicode 8 emoji will be added when the spec is finalised. * * This allows us to store emoji in a DB using the utf8 character set. * @@ -4198,7 +4198,6 @@ function wp_encode_emoji( $content ) { | \xF0\x9F\x98[\x80-\xBF] # Smilies | \xF0\x9F\x99[\x80-\x8F] | \xF0\x9F\x9A[\x80-\xBF] # Transport and map symbols - | \xF0\x9F\x99[\x80-\x85] )/x'; $matches = array();