Changeset 37469

Timestamp:

05/20/2016 04:53:40 AM (10 years ago)

Author:

pento

Message:

Emoji: Allow emoji in blogname and blogdescription on utf8 installs.

When the options table is set to utf8 instead of utf8mb4, emoji will be stripped from the blog name and description when they're saved. Instead of stripping them, they can be encode as HTML entities.

Fixes #36122.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/option/sanitize-option.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -3707 +3707 @@
         case 'blogname':
             $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+            if ( $value !== $original_value ) {
+                $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', wp_encode_emoji( $original_value ) );
+            }
+
             if ( is_wp_error( $value ) ) {
                 $error = $value->get_error_message();

trunk/tests/phpunit/tests/option/sanitize-option.php

@@ -103 +103 @@
     }
 
+    /**
+     * @ticket #36122
+     */
+    public function test_emoji_in_blogname_and_description() {
+        global $wpdb;
+
+        $value = "whee\xf0\x9f\x98\x88";
+
+        if ( 'utf8mb4' === $wpdb->get_col_charset( $wpdb->options, 'option_value' ) ) {
+            $expected = $value;
+        } else {
+            $expected = 'whee😈';
+        }
+
+        $this->assertSame( $expected, sanitize_option( 'blogname', $value ) );
+        $this->assertSame( $expected, sanitize_option( 'blogdescription', $value ) );
+    }
 }