WordPress.org

Make WordPress Core

Changeset 32104


Ignore:
Timestamp:
04/10/2015 06:19:39 AM (4 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:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/functions.php

    r31967 r32104  
    29722972            ':lol:' => "\xf0\x9f\x98\x84",
    29732973            ':mad:' => "\xf0\x9f\x98\xa1",
    2974             ':sad:' => "\xf0\x9f\x98\xa6",
     2974            ':sad:' => 'frownie.png',
    29752975              '8-)' => "\xf0\x9f\x98\x8e",
    29762976              '8-O' => "\xf0\x9f\x98\xaf",
    2977               ':-(' => "\xf0\x9f\x98\xa6",
     2977              ':-(' => 'frownie.png',
    29782978              ':-)' => 'simple-smile.png',
    29792979              ':-?' => "\xf0\x9f\x98\xaf",
     
    29872987        //     '8)' => "\xf0\x9f\x98\x8e",
    29882988               '8O' => "\xf0\x9f\x98\xaf",
    2989                ':(' => "\xf0\x9f\x98\xa6",
     2989               ':(' => 'frownie.png',
    29902990               ':)' => 'simple-smile.png',
    29912991               ':?' => "\xf0\x9f\x98\xaf",
  • trunk/tests/phpunit/tests/formatting/Smilies.php

    r31909 r32104  
    170170            array (
    171171                '8-O :-(',
    172                 "\xf0\x9f\x98\xaf \xf0\x9f\x98\xa6"
     172                "\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;\" />"
    173173            ),
    174174            array (
     
    182182            array (
    183183                '8-) :-(',
    184                 "\xf0\x9f\x98\x8e \xf0\x9f\x98\xa6"
     184                "\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;\" />"
    185185            ),
    186186            array (
     
    190190            array (
    191191                '8O :twisted: :( :? :(',
    192                 "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x98\xa6 \xf0\x9f\x98\xaf \xf0\x9f\x98\xa6"
     192                "\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;\" />"
    193193            ),
    194194        );
Note: See TracChangeset for help on using the changeset viewer.