Changeset 32104

Timestamp:

04/10/2015 06:19:39 AM (11 years ago)

Author:

pento

Message:

Smilies: Update our few remaining smilies to better align with Twemoji, and add frownie.png until Twemoji provide a build containing it.

Props joen.

See #31709.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• src/wp-includes/images/smilies/frownie.png (added)
• src/wp-includes/images/smilies/mrgreen.png (modified) ( previous)
• src/wp-includes/images/smilies/rolleyes.png (modified) ( previous)
• src/wp-includes/images/smilies/simple-smile.png (modified) ( previous)
• tests/phpunit/tests/formatting/Smilies.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -2972 +2972 @@
                     ':lol:' => "\xf0\x9f\x98\x84",
                     ':mad:' => "\xf0\x9f\x98\xa1",
-                    ':sad:' => "\xf0\x9f\x98\xa6",
+                    ':sad:' => 'frownie.png',
                       '8-)' => "\xf0\x9f\x98\x8e",
                       '8-O' => "\xf0\x9f\x98\xaf",
-                      ':-(' => "\xf0\x9f\x98\xa6",
+                      ':-(' => 'frownie.png',
                       ':-)' => 'simple-smile.png',
                       ':-?' => "\xf0\x9f\x98\xaf",
@@ -2987 +2987 @@
                 //     '8)' => "\xf0\x9f\x98\x8e",
                        '8O' => "\xf0\x9f\x98\xaf",
-                       ':(' => "\xf0\x9f\x98\xa6",
+                       ':(' => 'frownie.png',
                        ':)' => 'simple-smile.png',
                        ':?' => "\xf0\x9f\x98\xaf",

trunk/tests/phpunit/tests/formatting/Smilies.php

@@ -170 +170 @@
                         array (
                                 '8-O :-(',
-                                "\xf0\x9f\x98\xaf \xf0\x9f\x98\xa6"
+                                "\xf0\x9f\x98\xaf <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":-(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
                         ),
                         array (
@@ -182 +182 @@
                         array (
                                 '8-) :-(',
-                                "\xf0\x9f\x98\x8e \xf0\x9f\x98\xa6"
+                                "\xf0\x9f\x98\x8e <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":-(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
                         ),
                         array (
@@ -190 +190 @@
                         array (
                                 '8O :twisted: :( :? :(',
-                                "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x98\xa6 \xf0\x9f\x98\xaf \xf0\x9f\x98\xa6"
+                                "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" /> \xf0\x9f\x98\xaf <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
                         ),
                 );