diff --git a/wp-includes/functions.php b/wp-includes/functions.php index f4d262fd9d..534deb0942 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2958,28 +2958,28 @@ function smilies_init() { ':arrow:' => "\xe2\x9e\xa1", ':shock:' => "\xf0\x9f\x98\xaf", ':smile:' => 'simple-smile.png', - ':???:' => "\xf0\x9f\x98\xaf", + ':???:' => "\xf0\x9f\x98\x95", ':cool:' => "\xf0\x9f\x98\x8e", ':evil:' => "\xf0\x9f\x91\xbf", - ':grin:' => "\xf0\x9f\x98\x84", + ':grin:' => "\xf0\x9f\x98\x80", ':idea:' => "\xf0\x9f\x92\xa1", ':oops:' => "\xf0\x9f\x98\xb3", ':razz:' => "\xf0\x9f\x98\x9b", ':roll:' => 'rolleyes.png', ':wink:' => "\xf0\x9f\x98\x89", ':cry:' => "\xf0\x9f\x98\xa5", - ':eek:' => "\xf0\x9f\x98\xaf", - ':lol:' => "\xf0\x9f\x98\x84", + ':eek:' => "\xf0\x9f\x98\xae", + ':lol:' => "\xf0\x9f\x98\x86", ':mad:' => "\xf0\x9f\x98\xa1", ':sad:' => 'frownie.png', '8-)' => "\xf0\x9f\x98\x8e", '8-O' => "\xf0\x9f\x98\xaf", ':-(' => 'frownie.png', ':-)' => 'simple-smile.png', - ':-?' => "\xf0\x9f\x98\xaf", - ':-D' => "\xf0\x9f\x98\x84", + ':-?' => "\xf0\x9f\x98\x95", + ':-D' => "\xf0\x9f\x98\x80", ':-P' => "\xf0\x9f\x98\x9b", - ':-o' => "\xf0\x9f\x98\xaf", + ':-o' => "\xf0\x9f\x98\xae", ':-x' => "\xf0\x9f\x98\xa1", ':-|' => "\xf0\x9f\x98\x90", ';-)' => "\xf0\x9f\x98\x89", @@ -2988,8 +2988,8 @@ function smilies_init() { '8O' => "\xf0\x9f\x98\xaf", ':(' => 'frownie.png', ':)' => 'simple-smile.png', - ':?' => "\xf0\x9f\x98\xaf", - ':D' => "\xf0\x9f\x98\x84", + ':?' => "\xf0\x9f\x98\x95", + ':D' => "\xf0\x9f\x98\x80", ':P' => "\xf0\x9f\x98\x9b", ':o' => "\xf0\x9f\x98\xaf", ':x' => "\xf0\x9f\x98\xa1", diff --git a/wp-includes/version.php b/wp-includes/version.php index c880c4f2ba..c43bcb323e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-beta4-32104'; +$wp_version = '4.2-beta4-32105'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.