From 1f05ad1b5069d25d3999400aabfb431fbf21da7d Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 13 Mar 2015 20:26:39 +0000
Subject: [PATCH] Emoji: better regex when testing for only char emoji. Props
 iseulde. See #31242.

git-svn-id: https://develop.svn.wordpress.org/trunk@31772 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/wp-emoji.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/js/wp-emoji.js b/src/wp-includes/js/wp-emoji.js
index 73cfba389d..85ca1e4652 100644
--- a/src/wp-includes/js/wp-emoji.js
+++ b/src/wp-includes/js/wp-emoji.js
@@ -102,7 +102,7 @@ window.wp = window.wp || {};
 			}
 
 			/*
-			 * Chrome OS X added native emoji rendering in M41. Unfortunately,
+			 * Chrome on OS X added native emoji rendering in M41. Unfortunately,
 			 * it doesn't work when the font is bolder than 500 weight. So, we
 			 * check for bold rendering support to avoid invisible emoji in Chrome.
 			 */
@@ -174,7 +174,9 @@ window.wp = window.wp || {};
 							return false;
 					}
 
-					if ( emoji.parseFlags && ! emoji.parseAllEmoji && ! icon.match( /^1f1(e[6-9a-f]|f[1-9a-f])-1f1(e[6-9a-f]|f[1-9a-f])$/ ) ) {
+					if ( emoji.parseFlags && ! emoji.parseAllEmoji &&
+						! /^1f1(?:e[6-9a-f]|f[1-9a-f])-1f1(?:e[6-9a-f]|f[1-9a-f])$/.test( icon ) ) {
+
 						return false;
 					}