From 7fbb0e091a1fa766a340b5303033d0f0cd0d0bdb Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 13 Mar 2015 17:19:28 +0000
Subject: [PATCH] Emoji: update Twemoji to 1.3.1. Props iseulde. See #31242.

git-svn-id: https://develop.svn.wordpress.org/trunk@31766 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/twemoji.js     | 6 +++---
 src/wp-includes/script-loader.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/js/twemoji.js b/src/wp-includes/js/twemoji.js
index 217ea71180..df77a946d3 100644
--- a/src/wp-includes/js/twemoji.js
+++ b/src/wp-includes/js/twemoji.js
@@ -326,7 +326,7 @@ var twemoji = (function (
     var
       allText = grabAllTextNodes(node, []),
       length = allText.length,
-      modified = false,
+      modified,
       fragment,
       subnode,
       text,
@@ -339,6 +339,7 @@ var twemoji = (function (
       variant,
       src;
     while (length--) {
+      modified = false;
       fragment = document.createDocumentFragment();
       subnode = allText[length];
       text = subnode.nodeValue;
@@ -385,7 +386,6 @@ var twemoji = (function (
         // replace the text node only, leave intact
         // anything else surrounding such text
         subnode.parentNode.replaceChild(fragment, subnode);
-        modified = false;
       }
     }
     return node;
@@ -519,4 +519,4 @@ var twemoji = (function (
     return r.join(sep || '-');
   }
 
-}());
+}());
\ No newline at end of file
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index c1bd357662..8db4416325 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -424,7 +424,7 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'media-audiovideo', "/wp-includes/js/media/audio-video$suffix.js", array( 'media-editor' ), false, 1 );
 	$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
 
-	$scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), '1.3.0', 1 );
+	$scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), '1.3.1', 1 );
 	$scripts->add( 'emoji', "/wp-includes/js/wp-emoji$suffix.js", array( 'twemoji' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize( 'emoji', '_wpemojiSettings', array(
 		/**