From 3bd66eff618126413db622ebe1648a1636a8c6a0 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Fri, 10 Apr 2015 06:19:39 +0000
Subject: [PATCH] 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                 |   6 +++---
 src/wp-includes/images/smilies/frownie.png    | Bin 0 -> 1007 bytes
 src/wp-includes/images/smilies/mrgreen.png    | Bin 1483 -> 1486 bytes
 src/wp-includes/images/smilies/rolleyes.png   | Bin 1622 -> 1233 bytes
 .../images/smilies/simple-smile.png           | Bin 1574 -> 1008 bytes
 tests/phpunit/tests/formatting/Smilies.php    |   6 +++---
 6 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100755 src/wp-includes/images/smilies/frownie.png

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 388922cb90..f4d262fd9d 100644
--- a/src/wp-includes/functions.php
+++ b/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",
diff --git a/src/wp-includes/images/smilies/frownie.png b/src/wp-includes/images/smilies/frownie.png
new file mode 100755
index 0000000000000000000000000000000000000000..1f888a6775ef8878160dc935c2f95eecca79ba56
GIT binary patch
literal 1007
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7`X#{LR^8||3GlYmli0^l_A}Y
zF~glP(}O9?gDKmSDc761JcOe>gtID)t16tUHj1YqhPNq}uQ`sdHBq29U8FBVq(4)1
zN}l-a66v{RG7BnX7gowGuTxx6ueh>7X>E(j=1%pUeOf#FwNB14I=jH+{36o}i%l;s
zF}t+H?8-9pE6Xgdue7|e%JSA~t6OWVZ?Ca_u)+4hM!Uyb?4NA0f4$rJ{XW+Z`&~aB
zbpLwT<LeQRzo&fuodzP1_wOHInF$OI`H~>NU|{et^XTdu+j+z#r*(Gq_RU?gX7k}A
zH*dXo{pIV=KMIxmo-i;lm3X>1hD01bJ0miAmV-cprelao8%I}#uBU1G?A^<r`OV(u
zdHc@wKmX%{Hf2m{brk!y@c!dB@6=Do8Ee-Hw5SBAB%WB67qRU!ONQ09)EBFI%6bJg
zXWe9IYg?%~XOYuV)`?rRSos1svKe0K;&k1q<+E^>w?fb}D}$+h3w?y2zMjxgWfvEc
z<?M88sl-GZZkZ{mJ|@QeF=x)Zbf@_Br%zIL-F(2;(krA%WXhpMHP*c==BB%P$p!_6
zOI(y$a)hI+XzrFpetHV4oU&F;UZj+=z(R3Vs^HaQi<oYIOFmp`u6HPT(c{+gz}C#4
zZ-w~3b4@y`tvvD2yYshOHu0W(q?@X7=?0_xU&e0F$F~AfHu0u-T-x!n`-xjvpz|^%
z(M??rOO<SQdn{K{7KwNH7ox+*CK}0b)6TxZ)wN8cuGPmwhtEvZ^5N2gMjb(&cL9OI
zMwgc;2{c4Z+z?*8saxjB=i+2#;YrfmkxGBsr8i~lyf`tpMOyUcjS9)UoQG?_%{{*P
z;I*Ru3HLr-yS~|d%k0kFe|GxMt+`X0TIYVA{$id~nM|PHb&rm%mrrbRI>_hIf7@5+
z<g?rz`K<Pv9xibgs8Vl`znLTSvC1LIqQZ4DhuYf8cm2n7-pbYPudJx5+VQh&%Wjjd
zZ}Ts1QJazR_V-_V`8f9aU%x&~zQ3toEvoU#`yXrbxBoYP#r*f@rP^#;w_y9sJw^I^
z7ca8jaa`^G-vhxrr$-oBO_W<Nw5eQtyTZF~9FeY<9~U0lx9?N-ty{l#Zt7Ee^T><C
zQ;S<G>&Vo|LtOUnXYRPir|)`H^f=S$()={3Bt3y6v6&ouQUojBDt}PYx_b3Sec9{p
Z{J$#8w$JsKt^p=h22WQ%mvv4FO#tg5->Lur

literal 0
HcmV?d00001

diff --git a/src/wp-includes/images/smilies/mrgreen.png b/src/wp-includes/images/smilies/mrgreen.png
index 0976247382b5f8c9a5db7c50e241b7b96d6fe45d..b5e541f72a1d6d7a67a21c50add8b65a6b260052 100755
GIT binary patch
literal 1486
zcmcK3`9Bj390%~t9Z~jZ@;Em4+}X^v!)Avuo0*C5VD2k-j$T^m;d!k&mRcxRNR;$A
zA1S=bG4ezqSBg@P&>o@lF+6+zi0Auyf4|??_vg>+%Vp4Alofwg1ONcat`s6uvMK+y
zg0y6YAP8pw0N^siokfzI2L}h9?aBWKO-BPwl%W<{!bl5aq>VPx#u{ro8SCI+I(P{a
z9cL4W1i=(aG}9%U>$+IzQY`e`EcK~Y`tDZxv=au-76x={Lr;W}myNME5_ZxS=3{5#
zYj1MO-qhd0jDj!=M41Pn&4V%KY>Y(+)-ue=G6HuZ+S!`sU>!rSjwM>h5#jM9M4}5K
z$;Bp_f=qR@O{dyrxZ7n)(CodO?9b91Sa`?to~R36XdfavkA=ze#^ifremm*J^TqkO
z;EMe4#r}A{zw@O4!Y@>UAdn~sB3=z5mIjl`*yM6H`FaTXdZ<f9D5WZ#QXTHfX1LZw
zxZa3xtBayGL{l4LsJCL=B^qPhn__9V<LGxz)9=Q6v?O@klSpLzp2%oTWV9toA_zzh
zjmnBo<7QpFR#aG7a=Es&^yc-7rkbke+Un-IJ6$d9y<OdpAN)Br{(N?F?$!MK>xKEH
zm+K$b*F_tmPk(RiY;Ess?@CH67Vn8A$zI~DEJ-qkq%!GVlFX$KTUa5ml)%sk?#05Q
z%KGN^fx-EO4;!Dq{18Jk``!Tn(i~SJp5;66v}`R1gg-8fmVFQMjAz*0n>4T(t843M
zgHI~*DAdc$9k=#@4z#oI<+eG2x&I<K{RKNBZ9ebZ^UcEQiG=D^B{*sVJprSS8srr~
zWvd%gd!NUpbORC{;v(v>m2Z`g0ZclLjB)R5q6HxQdPM+^6<_2hMG2LaYKtM}vcP;C
zSfId%n?Vd%eV*kCSJ?8kVG~E?*0!@L@7H8-EF(TtdPv@FOs?cgC0WiB<lqS+$%IRd
z!udEy{;#R_FnucxMxdM`a{<q6GgD=NDa_#vzNynGMxUul7|?Z0>VgeaHX6!D9^-$J
zsV7$#+VqUw>wA=fUBm{Zy+5{oyBO~fCDw3kn2j2av|CBnOB+|EaA#Ig?&xzGvY6n#
zi<$LBW)6HXE!e57p&z<$I1V9YS;)h0KrO3u@M8G*CL!x5rP_+7+zK^mH~FSqoTK#Q
zEtN?GRA0{Y4G62pkzGB)MwJ4~t)C%nUl*Dqx<~&pL`3D51LsdLvT2`c_x)!QhCp$L
zM{*MKRwJW(YQlAPf-36ProQEtZ3g2kACoIIw7!!UYT5~VL5I3{K%j<!)ri1RIP@))
zD!9-gUK$D;FS!cg=&nKplj`x9wen?>d;dmOMqRGueaK)SC4+}XEkxWrlin-JdF0{c
z6|g_JTUF|TnKdhx`XHPG=h%rz*J?`OCH~ygevJh((T5ak!(~k4rdqQhu{@4$_W2}H
z<i|}Lzqw_m|8eC{B9h+jOHDJXQs{pE+q%zh<qqZ^Pd*v`$}!j$sv{L!nM&#h3%>LO
zSaNOun?#tJ3Iunu(GKj*Q$PQ~K8B6$UGX8}`cY*yV6lC!$_VG{L1UoPy8*2hpLXlL
z@4!QldE}zUWUnhxJ3cK1h^*JwjM3{UQWyU5kQb6xdQMpUfI^d5oSDWey?WT))7h?$
zwO7~_#oe{EB^0lZoK~KWDg<*gHF)IFLh#~0ojhRYPA5k(YPHMgua0fox+GDnv8qu2
znT`<oF_2y4)5tD{=t{+N3Q$nAGfYhm7Tm@yp0X*AYQzsW=bQyKaBzcVc`BTNs_hK7
z`;orW%j$dd{O`_Av$He4-bX{#Sjes~Pr2Hp%>0$6tt}JoKx@Iu+0RdHo}}bJmjw9*
prRMO!-H{Ac!Ssu{^JyF3jx-E`+MezGU`U=8;7XzsTbzS){{@!oj&uM3

delta 1465
zcmV;q1xEVL3(E_TB!B5pOjJex|Nj900DypiNw#fGvu07QbXB!=Q?qqbvT;zfb5FH&
zPqcDSvU5?haZ<E$QM7VWvvN_hb5OK%QnGPUv~p6ja#6E#QL}PUvvN_haZ$5!QL}PU
zvvN_ha#6E#QL}OzIwTuABpf>>96Ti)JtZ7HCLKN}9X}@@J%1-3J}4hUDj-BEAVn)6
zMl2ymEFniNB1<nMO)(@+F(gkiBv3LYQ8Oo2HYiv(DOorvSve|NIVxN_D@ZddT{|mY
zJ1k*6En+?`V?HiQHZEmAFK0n8OgJ!TLNIAVFls|EYeX??Lo#heGH*sRa7Q$8NHlXu
zG;>KcbxAgNOMf<aOgDH<H+f7sR6#j@Pdb26I)PF<fl@nyQ#^uFJcCm_g;YI;RX&JT
zK8aU9ida93SU`+fK#f^JTS-EYTtbmsLXliTl3qiTT||{%M3-PkonuFxWJsT7NS|g(
zqGw8^X-cJOOJq_@rD;p1YD}kUOs8v1scTHBY)z_cO@FFwPOEHAtZh!LZceRkPp)rI
zuWwMWa8R;wQL=JTvvO*FaBYEee2syDl7@qnh=rAjjh&K^pOu!So1Uzqp{}K(ucoK7
ztFXJXy~e-D(96--)7jqI-QwQm>E`Y5?)3Kc_4oGn_xAew`u_g@|NsAyl6xNj001C#
zQchC<0e=Dq3Kke8D>FAbS!jKPhKiM$pRBpZ)Y|0d@ALNiUc;>b000AVNkl<ZSi`-T
z`CAe}7{|RY1Vm1eW2F?WG|R#)uROA(OG8UjvqMXxQp3um%v1&y74Q4}OIvmkn4Q^W
z7xwA<gOATU?|gK2X5M2G68@u7QsO0KNaZSx&VK-aL8np4r5Q0nk|c^ez)+q-k|Yq5
zrOXFd<twuUVA9oqL+W&%nABV|;FLKxl?NtSW&}}XlqE;wq-g;!Y16nlnR>ue`b;iP
zwh8c-DVr6Om;(eUCy@mtkVBGK)&&F$yShx1aF7Y}#nbd42I-MgkgNqUNy|K$G7zI=
zjDP!Oj1^>r?_Dm4S-DW$FvkuuM@AJjh(qd#c!(MPK8u~@@}RbG%v2&{9p!|z#>KSG
z-oHXzYWmAGD?@P}iO=0cK-ZX4nkaKU635Rof&}@8u2VCJ53qIGLRkwYneLJxNWmQV
zMRSNY*!(eQe#i7z1VKpt`Wl?^5H=44&3~_ud>728AYKrlbFegikdy++5&O^JjHj@9
zC}@6*OpsF`6?(+V=@|pC^>+bn{)YIgD3AsPJ)<U+PBF|il=&9wuc1IXbYQN<N}k6r
zO!J@H7YIwG8}-*wAOr4B&3^iUGfz9GaApHlj{y;sA|?pGG+{EZeQcr9;kJKrWPd8!
zyx$`exb24z<O4ERT&;Q1{}~%0-OiWxs!}qP+?_)YBy>gkh;v=6xKrQqsQr20o1yow
zyE`7=tE;+sIW$VVK(7dNX&VWisz)y^6h>~4K7+;FjN(D^M+F*2pulD$eSF8;e(!h#
zj?pmg^=}{h$lq*eV1q&}wX~J9fPap5w>CFc{mV-W3roxX)s4-q-6LvXCE(MD3AK^I
zzn%KSi>GI-I$fk(+A+aDG98W5OYk1BaSpt+$0#NpK?%}E`&F-<;4mj^)%3Uxmmr~(
z-5>g{zC9*p&llQ(er(E)EFwIW;XUe{U*Fk33?L5och=`S!y}a*Y!LyKHGgA8j4dx|
zZZ2V%ipE&V8mQ3fihiuS*a|JU^lOX8X=5+_;9}Iy&9QS7qi}ibaah<f7KewcJZ2Q^
z&N4PmnUlL<XSNXT)<PVnu+<%{g+Q7b7m6xub@6Cw&^BwLr`8&#SZjMG__bNM#&2f0
z*I}=#vpaf+XZSaMqP3zTHZsTJwd>+NAc*&*A>t#8h|fMEK17N5G$!g}oe=#4t`bae
TjvCDe00000NkvXXu0mjfLCl{A

diff --git a/src/wp-includes/images/smilies/rolleyes.png b/src/wp-includes/images/smilies/rolleyes.png
index cd5a713f4f1fc20070b778e7265b0d4149e9a0b4..fe3bf8d50874af2edc3fb0515abda4843cdd7e2c 100755
GIT binary patch
delta 1186
zcmbu8i8s^<0Dyl6xyeW))Tot6&R9|Xoa4>7S7>7M+())@Y-);TG7l3P$75MxX4`U<
zBX`cJ7)NGIBg|rJ3ZdM`Z^jIMw*O(j_x%Omd*8SsS1#u#7m08$Hy;cD0Q)~+x&IGy
zuc3)iSgB|%A_j+uagmI5myY$2PWVM839pcHRhb;FOO7%oN1LaIs6GrsW`-lPBGqzZ
z)bp>S3T|o?#T_Z31k&yq)Tiq;Q1qHIPPJs|w`Li1<QOvYjb1mGz9}$fmYieKFnz_Q
z?@G<tbPLWC%kheHyejL77dDeGY^JKue<apk;MZN8ZUASRY`?cTEOk1qbYWJzF>4IW
z#%t%Tx7aPA2-^4xL2Hm;6A}ucZLwf;PO!NkfR+T%ijavDu1#$(4Q(%TM053`xn^;{
zi}*{K_zPV;{cLBzb%$THJLtMMdIKJEhdFqda|P!3!`vX48w_(p_E|*teYW?)2`SSb
zJ<-2=dt3ql2}wmGld~W;Ff`&}#v^L!)9S{a-igVD#Vts*t3&9X1pve@&dJ^f-@`8Y
zMjSEK=&v`l3O#BSsu(w{mVMo$!lN^rK)d9ZP9_{z#t^o5l%5&kikp;ZoohlWe{(Bf
zQqOZkH`XZ+fwU(|l;wLl49#YqBzc?BxX9zFkG~_lL%&JWn{udCDRk^L)gpg4jFcT$
z`;|Tll9P{k<2XTA$+2mbD)S%lG4Xl@bo<D5kf+1fs^b5Ze#%NA<;km9oK<lsrUjD^
z*(;wgaC?77)^HHP94xut`f(KUl;Oj#L~*C|-ID5pD~NwRp4{8bTrKRez@F^m(8Fg}
zMq|dV)xdDh276#)>Y{$-p(yI-rALicr_+80wUMxHe4C7>oc#1=NYtm+Kr`R{Z7pH_
zfDv9EsS{F`$l59{2>ihK3?8;7N0=&SAo<L@G+)E6=c_O?=|ak`{(%$UJ$ZlDF7nOL
z**dmXL<tNfcVxUYyBr+^9<v9Xe)GxzERWVTQJr<>W>jY#-yy2Pl3PA3a~S0NL7?i9
zvA8iQCP}H`z%0cv<>kOaMv<J0<PJC1QUu!FRrIceUa;HgY$5k<g$DhguU31tLVFV0
zAdG}OB&&6&MKifOJKxk!^J=Zlu!7AEkVK3inOj7eTN^c}-2m<SfUif@M~zYCf&(ky
ztdbY^N~TP2SAe7mBZ}mb^_*HT>KwW7tx)mcy$2d7QAEd-aHfOQ+na1*UvS4Hzy~ut
zkMb+KsKYD>_Ee3FX5r4KB3b6<sSd2Sdd7_}xzGH5jZR!gUC!##mKzGBR!V#0i3Y=Y
zM%A*BYR8{z-wbHvt4U%AS~a%|%P6r8yES~ly25RS_^Vd{129WK*ZTayYiSXhEzUoV
zR9UeNXJ6(muMhc#^5Unrn75veB~<wJO%<Vr6J2ldU-ry2|E=yn#4BO@{nMCAYPI5d
zhUACN*D(@7e973TZYiPe*vAR?_J%eB)Ymm{n`C9VF?lBX5nAktv#zP^oWqB7P@T*5
v<^lUpxoN$QhadKXNR=n$Hkvyek3Cr8y+l7H?X;`yk8uDT#>1)BAt>cP_Vs0`

delta 1584
zcmV-02G9A?3DyjdBS!*8P)t-s|NsC0zd--SRsYOQ|IbkW%uWBxOaIJJ|H@7O%ufHz
zP5;eK|IJPR%T52xPXEhJ|IAJQ%T52xP5;eJ|IAJQ&5<z~e`ZAhXGQ>LMgeC=0%}PD
zYDx!dO9*UC3T;dTZA}YqP!DlV1#(aZa#Iy^RTOtr33yu`dR`)cWhsGO4uNJWfoL#-
zXfcCc4uoqog<ubeV-bmPJ&I)#j(A6pX%&xjHj!)=l4};1f>oG;R+xiUn{ykSh+dv{
z9G-U^pm-gie|a6Fdmf{aYNnKLs(>P@fg-A#c&maVw5Er(sEW9aDY>nYxvrADkSn~Q
zVZ5=Hy{?SIxueIvs>qx&$(%CDz^%-vQq7<=&Y?BXw|mi}Hqp$y)TTJp(81TJIoPyW
z+11I~t2)}OJKe23-PzCG+R)#<Y2x77<Fh~Hv_IwLf8XY{K<DS->9|7bxkBu_MC|P9
z?Z8p)@9pmI?(XpK@V`a!z((@HNAljR^7Qre!bkM?`1JSr_4e}h_Ve}j^!4}k_4oJn
z`1$qt`u4;~_VVKP^X2yS>-P2W_r*!~#!2_bPxtQ8_wLsB@6`A2*ZAqd`0K~`?8*4;
z&H3c5fBELI`R26x;GO#7qx#~e`s1kj<f{A0OZ(i4``nHD-H-d-k^9|}``(oM-<JH!
zPyE?{{Mv;5%1r&!XZ_P@{nTsy)o%UOZ~fMC{nm8-*LeQRP5#eU{?cRq(q#Y4P5;bJ
z|IJVT%~1c&Q~%CY5bjVA0000UbW%=J00apNe-IQRBR@e<Qeb0gij||Vw!Of}*4XXv
z_WS(msL|#C00W^(L_t(o!@XGdUlTDDXBSFK2Q7sH2Z&p7i=wzUD(;E6aSz13MMQ)s
zqJkB*SR7T{b)gWf{Ab?fF4yLoD;K<v-ydi{@4b9Ulb3JaOH9oFL!7}7_iqgGMvKki
ze{w?}ZkNMmF~$#uCDCNhh6-fcO^IwQv1Vs3q$1a8j@8bSnhB#IGgTu^at0g#8Oa)G
zlG33Dq$dr;lad8BAuA<1Pg)Mth@7-&n`MOzu&Qoff&((ak)SdkMjoDtJ|`<=hLyU`
za1fxZc#2}bdi>tD7EedlXT{LI?q`phfA2o-{P+v)T|^cnk@*w!H39*rwyxRrAl%X0
zitOOPrp?DtJ}EPk%;$gyMc-IGl;gOu+e41G^~g~(lecrT&I>uNIA0`BgZOXPaR>$b
zvE#XDubnJ9CcWov<hdixX;7RGxG+MD=O*-vjvq~;W4&bOHVP-0&<$cjJ~15Zf5Gwj
z*O0ycj^vn+9rM2P<}g)>CG@AKQHtM!<GJHs1V^W22PN2E(kkdvC@syzg#0-ED2^Xi
z*CjX}Vn-Qvl-&yQcC$?6B#68?zHW*XzYuf?OV@xMRRz*6RDrL&!zt@Lsn2aV9vm5o
z;>Vu@9^U><wu5q!s2qSdf{x=Gf5AlNZcAuD&D=5ExaAiCXyNUzLUvGDTv%9K$$xnv
zj4(+=cBnEV0hiF<HgZNnF4dxs*TM+9bPp=-FE5CMmsq1PpzX{SZ%(7)So$gPeqz@`
zsQ-<I7!i?0K_ur<2#q~N9)-{@4zVC2n^I(a5%E4Uvt``u6-U?*QG~+cf3qgT6C}@?
zjCWXb5s@oG_X6ayHUt!>ALB`%WOpGVccg*_!sp}(MCcJh)6+lL>_&AIO^dNY^6Tsi
z(i9Sa=I$`FP>C7nvW_&n&Fk->YIeKtLw~r{piaaFgW6AHMV!iFv%;;i{mgLD6OtVc
z`VnD=je2MY0Si?|1_2{gf7sX|37b-C*<q)PKRZnH>xdchb)>i;nc-BqvYBC4DI!=A
zRzxVunyVYGvk;}K7FzJos8yFW^JGLR{a{6Y{?rw_Z-<-iovE(=L?cR$R*b?Ev-x5p
zZ}h~{#mkm1S}<o?(Ga2fSW9cTqL;@I?wg*+DNuT!(rzUURIo#MUS->oBAI0PjFl&8
z%~p!W7UJdE!#gT=?mc+=r{)$yzotgNHcPk0Prp`FzvfuSc3r;*1pS^gbbMsd@!3be
ihbTRt#`JuwW5Qo{2tybogm^Rn0000<MNUMnLSTaMV^UK9

diff --git a/src/wp-includes/images/smilies/simple-smile.png b/src/wp-includes/images/smilies/simple-smile.png
index fbdcd03d2b058aa94be250b61c53456e65b0027d..dc334abc6f1514f8ecceb1eab725a8fda74de159 100755
GIT binary patch
delta 916
zcmV;F18e-I4Dbh#BMbo%P)t-s00030|NoO=0VI=f0Tq*Q0Tq)#0SSL*MF3|;0cb}7
zX-EQUNCIm~0&PnJcT@;>R0(=k3VK%xeOe5FTn&O=4uf6}g<%klXB3WT6pv{Ylx`QB
zbQ_&^9G-R@pm-gjc^;>JA*g>LsemG_ge0?xC$x$uxsEEyoHEUzG|!?n(4#fcq&Cu|
zHq@p!)TTJssX5rHIoW@!I@+r`+N?X<tUKVaJ>aoE<Fr5Iv_I>+L+`#t@V`a!!AJGO
zNcF@>{mM-K%S`^uP5;bI{+DnL0000VbW%=J000343@tA+K1g0;W{HZ8j-8~ev%|#M
z+UV=__4)iDdA{TT00M7GL_t(o!_Amyd)hD%fL+I!<q!u9#w>r66tbJyX0~KCU1<`s
zll%Waq>g|VB%LkU`q1~|3B3=trPH0XcZ$#yiZl$}v~0)q>Hu}mb!^Mj(VvEhj9jS(
z6tz;$kQ8N#4dBu!W+X(}3WQL}3W`!?h@hMj5E(Nqh@@p3QKEDegs7&&MfoNO(#(g5
z^l6Zwpktz`S&)BXc8V|3B|U*j=ZdC5ngUOhhZy8pQMwsN)J)SNqYAO88kA@TVq#B<
zQmwe6R%$|2hS-$HMOjEdc1%=BBC7loW$3YQ>+SaX1v`fy&-@h?sgd7pKcIaHV)5cg
zWYGC}%O`AsSiE5jMLBxH`@w{H(RgksD$xV}5Yc#PAku$pNkuiCh)hT-0+WcW<RXiR
zY$iUByi_a>HW4`h$v!`TLqskUzeE-!76+GzJa#KwAX@~Bdqh-+#MFrh6rfh5?9sgB
zA`kie(zwWil*U1}i2UJ(Y+7k7B#lU8B8g3wVPd0F?dsC^sEI$8R(YwGO8(2f|M4zN
zbN9*jm$`q*fATo`737M};XS6gKkNpX<R|wyq7KO3Thi(5Uhy>7d!4t@9{+%(kL>+H
zB3%1?Ga2uH`7jvS$Bt~Oh<M%`W%-4j-g*Dw>FJ^WwYRe{itavRMFd^eydL=>9KGUY
z4O3_xcQH-(IIPfOOTXI<zGve$y!6x9oqMvvYF2PgqKZ*odHiy=JvVNd+dg}VE|2*I
z`{U`s=3?-=x{I3!r;kDfySf%a(+Y~38g*@!vc@m?Pf|~Zx1#ErV}<Q{urh5m7YORE
qG!$O4D7^Mjco7xrYV1F|_4@;A?~g!8S$?em0000<MNUMnLSTZh47jlX

literal 1574
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Qm<$7aLR|lY0K@<P4gXh#{=XXf
z|F-A<{SN<+h5o<j2I8LZ{C_6&|M`Ibm%RU<4E%q>@Bb;U|L6SvpYa6=p7r~G+VB5a
z@BgQP2+TO;`~Qsp|8qVdH9!(5cm^mAW}Nl~F`!(aGT;BFVd6kGND3$jR179T8i9g9
zHdqUU3zdZ!0yY6C0zxqD5WOJlz=nVf1S1d^g8>l)X(5QfRuEQ(ZcdsjL%JIfF=l!&
zWqUE_`mhxEu@?HX6$P-B262>ya8!nIR)uj@M{w6fa@R)k)J5^sNAonr@wFuibfyS(
zrwR9@3HPRp^ks<jXNpeElbBU3wV*<Fakc!CYWbzL3d`#iSJW%6YE;_Xp}wt0WA_B@
zy_0kfP18Ry+wjypqq7T4&Mh#xu-NqCVzVnt&9AStys^si<|?b3tF7*?wRyP7?$KuZ
z$D8e+ZgqIE!|CNtr`Nlk-|uz(u;2CbLHDnRJ-#3H{Bg|d*Kx1kC%ylk_W1`wAP*L3
z?rj35p^}myzhDMNCT2Ev4o+?!K7Ii~VQ~p5IRzDUO&vpHQ*%o@XIF1uKmWkc@W`mR
zq~w&;-28&#vWlvj+J?sFmbTu$snci8nLB^clI3gHt>3V9`_5f^_U=D;?D(m37cO49
zeErt#J9i&Ee)9C?tJiPdefs?6>$mSee*OOYPbML35(5LXfv1aOh=k<ZgWu!N6w0uF
z_|Cbrhwaq8lV{{qjrFQ!jQm@AoOYH!IiYh?TRZxippjSA-_jkw>vo@iUVQ)k-S5@k
zx%=CnPyVMnmo3frWbsa0>udV)6DHdlbtYXZ{jq58gemLKz4JA*G~)J3OgVi<Wm95?
zqR-pem!|5x+AbydR%*V3*q5kBt|qsC1&2twZg_AZqbunMW5ndw3p|!pCtfX5pIM~S
z#@p&=G?_bkn&pWIv7A$i&dhv=*Ii6eC^gTqzB2#NT4$bZsuQv#l8hQf=5A9^JKCut
z-7Vp(>N$OG$HjkgDzjQ<oK*`{REd|1TVK!0y#CdC`#(%4%Y>FVetOAc9B$_{!+q+R
znrFf)FGVKt2Hv*h%V=3Nk@?(KN0VNsYYtypn)MtDJDcY@Y-zOmvZmpMR<@nfr-`QF
zil3HE$m3DDx~7uxB=@xtXQRFnOM$H$)-g_EySCNAq`jnDA<O#Qtm6}G($0P~>-glk
zU1*ZjwLOhbbhGswHg%QER@`~iG4#H|&#<G8+ZAql?Go~srDgd*Po&&(!6wd0wM$;|
z9F_g|xWriG?DC)e)&V687pQ35dM}&2?q`p|{OlS1ceC4-I!#goYHPnSw%OVI<_eX3
zY17f&UXpj@sIQgyqen`2V~(Wiy;M`yo9sEgaYsr(yAp@qFR40(CVAd{-2x(k9&#+<
zGtS%Pws(G8o<4KE!vuH5X2lG<qi0Hc?GqoQC(9bo&uU9BXjPfw@ZkH${Hx#p2K;y*
z{yE>yo<)^YC4yt({o{;V`RDEb-`DW|{e1fsPZ{RRFKShJ70d^ek@dTFcTZ&bB<ml4
z1g3shJZa-GE9<69uCU5yk7+dmlde^nh1};lc`zmDOw*&grhLV3Wkoi7JiWtw^|f@U
z&Wc?hrB>PcaT%ZLHdw2lA8%LR^z+Ei)7#^>DfN_#NX}ps*3~sIZ06aSFuA)&HLpci
zTKJ?(mSK*DpK5UC?1Y=kOu81_4vN^aMcVbriB{E}d|hg*MFOX$O=Q*ltSu0D^pD7<
zW%-Os8ZW%B@kUjPwDql%b@`^^A5+NErL3){7R)ne=FdETNv2aa@Ba9xA6;DiYl7m-
fyD#_eKcO%CXwIBz7r9;m^Dcv@tDnm{r-UW|7z!V>

diff --git a/tests/phpunit/tests/formatting/Smilies.php b/tests/phpunit/tests/formatting/Smilies.php
index 0bce4766ee..90283c6531 100644
--- a/tests/phpunit/tests/formatting/Smilies.php
+++ b/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;\" />"
 			),
 		);
 	}