Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 22:32:52 +02:00
Code Issues Projects Releases Wiki Activity

Emoji: Tidy up the wp_encode_emoji() regex, and clarify the function comment on Unicode 8 support.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@32096


git-svn-id: http://core.svn.wordpress.org/trunk@32075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-04-09 04:37:30 +00:00
parent fd80c0f51f
commit dcf2710bc9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/formatting.php
View File

@ -4178,8 +4178,8 @@ function print_emoji_detection_script() {
/** /**
* Convert any 4 byte emoji in a string to their equivalent HTML entity. * 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 * Currently, only Unicode 7 emoji are supported. Skin tone modifiers are allowed,
* when the spec in finalised, along with the new skin-tone modifiers. * 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. * 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\x98[\x80-\xBF] # Smilies
| \xF0\x9F\x99[\x80-\x8F] | \xF0\x9F\x99[\x80-\x8F]
| \xF0\x9F\x9A[\x80-\xBF] # Transport and map symbols | \xF0\x9F\x9A[\x80-\xBF] # Transport and map symbols
| \xF0\x9F\x99[\x80-\x85]
)/x'; )/x';
$matches = array(); $matches = array();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta4-32095'; $wp_version = '4.2-beta4-32096';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.