<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[32105] trunk: Smilies: Tweak which smiley matches which emoji.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32105">32105</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32105","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-10 06:29:49 +0000 (Fri, 10 Apr 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Smilies: Tweak which smiley matches which emoji.
Props iseulde.
See <a href="https://core.trac.wordpress.org/ticket/31709">#31709</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsformattingSmiliesphp">trunk/tests/phpunit/tests/formatting/Smilies.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2015-04-10 06:19:39 UTC (rev 32104)
+++ trunk/src/wp-includes/functions.php 2015-04-10 06:29:49 UTC (rev 32105)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2958,28 +2958,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ':arrow:' => "\xe2\x9e\xa1",
</span><span class="cx" style="display: block; padding: 0 10px"> ':shock:' => "\xf0\x9f\x98\xaf",
</span><span class="cx" style="display: block; padding: 0 10px"> ':smile:' => 'simple-smile.png',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':???:' => "\xf0\x9f\x98\xaf",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':???:' => "\xf0\x9f\x98\x95",
</ins><span class="cx" style="display: block; padding: 0 10px"> ':cool:' => "\xf0\x9f\x98\x8e",
</span><span class="cx" style="display: block; padding: 0 10px"> ':evil:' => "\xf0\x9f\x91\xbf",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':grin:' => "\xf0\x9f\x98\x84",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':grin:' => "\xf0\x9f\x98\x80",
</ins><span class="cx" style="display: block; padding: 0 10px"> ':idea:' => "\xf0\x9f\x92\xa1",
</span><span class="cx" style="display: block; padding: 0 10px"> ':oops:' => "\xf0\x9f\x98\xb3",
</span><span class="cx" style="display: block; padding: 0 10px"> ':razz:' => "\xf0\x9f\x98\x9b",
</span><span class="cx" style="display: block; padding: 0 10px"> ':roll:' => 'rolleyes.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ':wink:' => "\xf0\x9f\x98\x89",
</span><span class="cx" style="display: block; padding: 0 10px"> ':cry:' => "\xf0\x9f\x98\xa5",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':eek:' => "\xf0\x9f\x98\xaf",
- ':lol:' => "\xf0\x9f\x98\x84",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':eek:' => "\xf0\x9f\x98\xae",
+ ':lol:' => "\xf0\x9f\x98\x86",
</ins><span class="cx" style="display: block; padding: 0 10px"> ':mad:' => "\xf0\x9f\x98\xa1",
</span><span class="cx" style="display: block; padding: 0 10px"> ':sad:' => 'frownie.png',
</span><span class="cx" style="display: block; padding: 0 10px"> '8-)' => "\xf0\x9f\x98\x8e",
</span><span class="cx" style="display: block; padding: 0 10px"> '8-O' => "\xf0\x9f\x98\xaf",
</span><span class="cx" style="display: block; padding: 0 10px"> ':-(' => 'frownie.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ':-)' => 'simple-smile.png',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':-?' => "\xf0\x9f\x98\xaf",
- ':-D' => "\xf0\x9f\x98\x84",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':-?' => "\xf0\x9f\x98\x95",
+ ':-D' => "\xf0\x9f\x98\x80",
</ins><span class="cx" style="display: block; padding: 0 10px"> ':-P' => "\xf0\x9f\x98\x9b",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':-o' => "\xf0\x9f\x98\xaf",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':-o' => "\xf0\x9f\x98\xae",
</ins><span class="cx" style="display: block; padding: 0 10px"> ':-x' => "\xf0\x9f\x98\xa1",
</span><span class="cx" style="display: block; padding: 0 10px"> ':-|' => "\xf0\x9f\x98\x90",
</span><span class="cx" style="display: block; padding: 0 10px"> ';-)' => "\xf0\x9f\x98\x89",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2988,8 +2988,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '8O' => "\xf0\x9f\x98\xaf",
</span><span class="cx" style="display: block; padding: 0 10px"> ':(' => 'frownie.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ':)' => 'simple-smile.png',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':?' => "\xf0\x9f\x98\xaf",
- ':D' => "\xf0\x9f\x98\x84",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':?' => "\xf0\x9f\x98\x95",
+ ':D' => "\xf0\x9f\x98\x80",
</ins><span class="cx" style="display: block; padding: 0 10px"> ':P' => "\xf0\x9f\x98\x9b",
</span><span class="cx" style="display: block; padding: 0 10px"> ':o' => "\xf0\x9f\x98\xaf",
</span><span class="cx" style="display: block; padding: 0 10px"> ':x' => "\xf0\x9f\x98\xa1",
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingSmiliesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/Smilies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Smilies.php 2015-04-10 06:19:39 UTC (rev 32104)
+++ trunk/tests/phpunit/tests/formatting/Smilies.php 2015-04-10 06:29:49 UTC (rev 32105)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array (
</span><span class="cx" style="display: block; padding: 0 10px"> array (
</span><span class="cx" style="display: block; padding: 0 10px"> 'Lorem ipsum dolor sit amet mauris ;-) Praesent gravida sodales. :lol: Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, :eek: mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, :mrgreen: tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus :?:',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x84 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xaf mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, <img src=\"${includes_path}mrgreen.png\" alt=\":mrgreen:\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" /> tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x86 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xae mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, <img src=\"${includes_path}mrgreen.png\" alt=\":mrgreen:\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" /> tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93"
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array (
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>Welcome to the jungle!</strong> We got fun n games! :) We got everything you want 8-) <em>Honey we know the names :)</em>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array (
</span><span class="cx" style="display: block; padding: 0 10px"> "<strong;)>a little bit of this\na little bit:other: of that :D\n:D a little bit of good\nyeah with a little bit of bad8O",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "<strong;)>a little bit of this\na little bit:other: of that \xf0\x9f\x98\x84\n\xf0\x9f\x98\x84 a little bit of good\nyeah with a little bit of bad8O"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "<strong;)>a little bit of this\na little bit:other: of that \xf0\x9f\x98\x80\n\xf0\x9f\x98\x80 a little bit of good\nyeah with a little bit of bad8O"
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array (
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong style="here comes the sun :-D">and I say it\'s allright:D:D',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array (
</span><span class="cx" style="display: block; padding: 0 10px"> '8O :twisted: :( :? :(',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "\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;\" />"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "\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\x95 <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>