Changeset 36410 for branches/4.4

Timestamp:

01/27/2016 10:10:58 AM (11 years ago)

Author:

dd32

Message:

Emoji: Work around a mod_security rule which prevents pages with 4 or more instances of String.fromCharCode( from being served.

Merges [36359] to the 4.4 branch.
Fixes #35412.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/js/wp-emoji-loader.js (modified) (5 diffs)

branches/4.4/src/wp-includes/js/wp-emoji-loader.js

@@ -14 +14 @@
                 var canvas = document.createElement( 'canvas' ),
                         context = canvas.getContext && canvas.getContext( '2d' ),
+                        stringFromCharCode = String.fromCharCode,
                         tone;
 
@@ -38 +39 @@
                          * to a larger image (4-5KB data URL).
                          */
-                        context.fillText( String.fromCharCode( 55356, 56806, 55356, 56826 ), 0, 0 );
+                        context.fillText( stringFromCharCode( 55356, 56806, 55356, 56826 ), 0, 0 );
                         return canvas.toDataURL().length > 3000;
                 } else if ( 'diversity' === type ) {
@@ -46 +47 @@
                          * compares if the emoji rendering has changed.
                          */
-                        context.fillText( String.fromCharCode( 55356, 57221 ), 0, 0 );
+                        context.fillText( stringFromCharCode( 55356, 57221 ), 0, 0 );
                         tone = context.getImageData( 16, 16, 1, 1 ).data.toString();
-                        context.fillText( String.fromCharCode( 55356, 57221, 55356, 57343 ), 0, 0 );
+                        context.fillText( stringFromCharCode( 55356, 57221, 55356, 57343 ), 0, 0 );
                         // Chrome has issues comparing arrays, so we compare it as a  string, instead.
                         return tone !== context.getImageData( 16, 16, 1, 1 ).data.toString();
@@ -58 +59 @@
                                  * as an empty square, so the center pixel will be blank.
                                  */
-                                context.fillText( String.fromCharCode( 55357, 56835 ), 0, 0 );
+                                context.fillText( stringFromCharCode( 55357, 56835 ), 0, 0 );
                         } else {
                                 /*
@@ -64 +65 @@
                                  * that the Unicode Consortium have made in years: the burrito.
                                  */
-                                context.fillText( String.fromCharCode( 55356, 57135 ), 0, 0 );
+                                context.fillText( stringFromCharCode( 55356, 57135 ), 0, 0 );
                         }
                         return context.getImageData( 16, 16, 1, 1 ).data[0] !== 0;