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.



git-svn-id: https://develop.svn.wordpress.org/trunk@32104 602fd350-edb4-49c9-b593-d223f7449a82

src/wp-includes/functions.php

@@ -2971,10 +2971,10 @@ function smilies_init() {
 		    ':eek:' => "\xf0\x9f\x98\xaf",
 		    ':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",
 		      ':-D' => "\xf0\x9f\x98\x84",
@@ -2986,7 +2986,7 @@ function smilies_init() {
 		// This one transformation breaks regular text with frequency.
 		//     '8)' => "\xf0\x9f\x98\x8e",
 		       '8O' => "\xf0\x9f\x98\xaf",
-		       ':(' => "\xf0\x9f\x98\xa6",
+		       ':(' => 'frownie.png',
 		       ':)' => 'simple-smile.png',
 		       ':?' => "\xf0\x9f\x98\xaf",
 		       ':D' => "\xf0\x9f\x98\x84",

tests/phpunit/tests/formatting/Smilies.php

@@ -169,7 +169,7 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
 		return array (
 			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 (
 				'8-) 8-O',
@@ -181,7 +181,7 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
 			),
 			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 (
 				'8-) :twisted:',
@@ -189,7 +189,7 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
 			),
 			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;\" />"
 			),
 		);
 	}