From 94d4cad701ab6b618afb288c88165c0ec17ae238 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 6 Mar 2012 18:15:45 -0500 Subject: [PATCH 1/3] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: string update [PRIVACY] privacy issue bug #314 * master: From 49b5a1bf20fd1652288a3aa77a839c558bc96497 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 7 Mar 2012 00:47:43 +0100 Subject: [PATCH 2/3] fix in navbar --- view/theme/diabook/nav.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 3a36e7da..027a8b7b 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -142,6 +142,10 @@
$langselector
+ + {# From 22624917e03b0ea90de19b0808c5435aa04d3613 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 23:54:31 +0000 Subject: [PATCH 3/3] improved smiley transparency --- images/smiley-beard.png | Bin 0 -> 1094 bytes images/smiley-cool.gif | Bin 354 -> 315 bytes images/smiley-cry.gif | Bin 329 -> 303 bytes images/smiley-embarassed.gif | Bin 331 -> 300 bytes images/smiley-foot-in-mouth.gif | Bin 344 -> 306 bytes images/smiley-frown.gif | Bin 340 -> 301 bytes images/smiley-heart.gif | Bin 592 -> 577 bytes images/smiley-innocent.gif | Bin 336 -> 305 bytes images/smiley-kiss.gif | Bin 338 -> 299 bytes images/smiley-laughing.gif | Bin 344 -> 306 bytes images/smiley-money-mouth.gif | Bin 321 -> 291 bytes images/smiley-sealed.gif | Bin 325 -> 293 bytes images/smiley-smile.gif | Bin 345 -> 306 bytes images/smiley-surprised.gif | Bin 342 -> 303 bytes images/smiley-tongue-out.gif | Bin 328 -> 290 bytes images/smiley-undecided.gif | Bin 337 -> 299 bytes images/smiley-whitebeard.png | Bin 0 -> 1060 bytes images/smiley-wink.gif | Bin 351 -> 312 bytes images/smiley-yell.gif | Bin 336 -> 298 bytes include/text.php | 4 ++-- 20 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 images/smiley-beard.png create mode 100644 images/smiley-whitebeard.png diff --git a/images/smiley-beard.png b/images/smiley-beard.png new file mode 100644 index 0000000000000000000000000000000000000000..5d4b28463f6d1b09991299734da0a0fdbbf285ed GIT binary patch literal 1094 zcmV-M1iAZ(P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX0|pj23M2yA-v9srLUct~bVF}# zZDnqB07FtmK~zstIv{6cEoyLOXCQVlE-)Y{b#rNMXCO&RM<7a2MMofZHZmzJAaQkJ zY-x0PAUz;4Ffa4?JXdVOr zL{)(l@JJmX;K{#~Zl6_~&JxEBB$K5p>Y-RXAW?CQBq<;n@Js^;0r2RUb#1?~`X|3# zJE^0?e-VXCs10x^7G-IvPiJOtuz&b1aSGt>(h=1fs@qUtqx==6*$;K_!F6y;WW5&F zZXrfV-F8%VvtH?DwY-;o!>@{Ekc?3b0;*NwL{Y8r>(o(AHqd6dTTj1%e*96Sapj;^ zmPhpIC(%pa9MHyEzg8B|@}0M}9xG1UFphwXf%5Y2^cEX<0?oLapRT}#FRK_Y$KvuD zzg&est}oz=As@n0=~{a(s-TL8`eaPZ^pBtG%EBUH7_fh2fD^BD)3>XFv41nL*D?Mc z96L6Gb%wL&=DG6oMP7XA2Zlxup=uDDq>|!V zs(sAOhD=OMQ7ZXZ*NvD!PK}>uaPU#QwUyhPKl=%Zb%+*;w(Vw5e>b0tz673+I1A)RDU!NEyHm{q5!Qx`jvfJ%C2a|ULjX@yDfILKyFgR&(RS9$ zG0oVptM4K1tSo`868I3e9ET2%@!IJRB|@O@})1(Oo5kAydzF`aNh$v5NUy$wrW)^s){;AZHwbrAK|O;9y}mXsGEg z62`Xh4TFW<1kNMOGrg6*RNhg(RdJ!1k(*g2E<=u0NyeO)nVGw}k6D(PpIs@4onNeF z!dz~deo0v+PC-d-M(O@$=_W}*e;!*gZfWuD;?mq=Qj0ZsrNqQ!85v~{N%8tC3-R(x f9y%n+&+DSbDZ9*0Q1-MM52uauJ^iQ3iVW5OAKF06 delta 270 zcmV+p0rCF30^$M;M@dFFIbjk25&+Z{kqlmc0000X`2+y~03QG>000005&#ka00rOR zCyG^RmSaj%$-!|)LRBh>9nqs{Pjq0k6hhM3WsaF$M}intS{Os5ahw`%2^s+cP!tpZ zK%wC2emx!n0YGp}-V+6wL3ld=4gq8W@j&_#5q^Dp9uyQC9&&vF3j-WzavlW;6dXNy z4FdxUj+z4<0}lrX2nP=qkDRIt9Ge*(qzMrj3jrIOjvI{`5eWzt3`G_T8yChG8w(a1 z9SkK12@M(+799Zr9n=~PzBCmA5)BU-)YKUd4H5!D9|!^o9kWIe9SH(WDHRk92}DZ? U3})2$P@$55g90f0N)ZA8I}5KvH2?qr diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif index 74d897a4f6d22e814e2b054e98b8a75fb464b4be..06e6ca2c2566156886e98894016e9a622800118b 100755 GIT binary patch delta 219 zcmX@fw4RB_-P6s&GEs;@h@nM(B2QfX|Ns9Lf3h$#Fvv6LFaQBahJkg>1NFX?%sysi zjxz;)GaY2+l?ynP8M*pe@HwqLpusD(?GWpU;tHvC6AwJjV3KuN&Y;Ruwb!0s@sx#3 zgE;qvO(iqB=WA|YWDwyhJ@~lr#xYZA5n&F=YEe;P5oxYERz{)fiIez+7+ICvn1%T! zPv#R2l$RCatQII0sOA)s6;x*AW#<%U;^h?==Va$)RN-LVz{h!rGmn>*L#3aY)!5XW Tm3gW<+v)NPZ2C9V6d9}miBdX& delta 245 zcmV000005&#ka00qY2 zCyH2UmSaj%10x8`Kw&DG3B=)f2O(s%6oygQ5gZP}uD}R>FoOoKa6u9sp2mQNp$I&V zE7HNl3T9Aca=ku!2;1S|fV^0cma1dk#C(wr000FAf&vc@2LdGm8XFW72pNbK6%!O- z8w!gU1pyL>prH>E0R<%k6Aq%H4ij+^9TEwM5P}eh2@)L<~6+>@EpxfA0YrcW^6+c diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif index 963a96b8a7593b1d8bcbab073abe5ee4e539dbf6..adc12e7c51488a4ad97edc07107a8186aa2d60be 100755 GIT binary patch delta 216 zcmX@jw1$bt-P6s&GEs;@h@nM(B2QfX|Ns9Lf3h$#Fvv6LFaQBahJkhE1NFX?%)TRP z9MXk-vY#~i7Tb7~=XJ-L_HyNJ)D*1hb!E|rFp=TD&hao~L&JgA2b~U_&4L^Te}Y4n zaI`8-ZuDuG%o!c~CxBb-{Lvx_7adMc39i_(3K^LuW@ZV_4o=oq>Gn>E?q279)>0OJ z*2ZbwJ&mmVLGs+$5=_Dj48r0Pl3d&>ENootJ9q8mVq2!fy`6VA@7^tHvfNIlY1~%& Q^6uQ1_g}asugG8x0C?a*g#Z8m delta 247 zcmV000005&#ka00qe4 zCyG*OmSak4#3l$Ep-C#)A&=rX%7b*Ylw`BuRT_6oWNviPsseQgvBqzk&weUcK z6sPg6H3=csUG0_=k6k#+@9JJ+I$xTVnU|Njl`BcUR-&=Bx0k=8K(3FOjhD?+ij$eY zTAqVvvNV%4F9X9gUb#GFTkd7+rI;baQhv@rrP}t8s|& WR2E8#g{lj4*tlKQzoVkaU=0A+n?PRx delta 260 zcmV+f0sH>40@wl!M@dFFIbjk25&+Z?kqlmc0000X`2+y~03QG>000005&#ka00q_H zCyG#MmSajrNVjbr5XA zj2MuVoSYAreF`3(0|pHS8VLgri3bP_qZmQ3w6qqqLN=r+`%U6llH+DA(x8-s*i=;9Lh%~$K3s=aq zu}tKdDl41HBh8hqEFvMvB+b8`Uz$l$LPV95LuSJU8IE98-W{FmWyJTntFei&INP&` Rgy^%`xLwr0uA<0b4FK>VKuG`q delta 256 zcmV+b0ssE30@MNwM@dFFIbjk25&+Z@kqlmc0000X`2+y~03QG>000005&#ka00q(D zCyG&NmSajvh9(G_Aw?=#FdpJKh{qJP)S*E^U?vL11cRV74x@-6;h1ufEN=88V3hra2E<092*0W8ygr5hlv+! zj*yy>6P0=h3X&9Z01yyk~2N4w%7#RW^55W%`0vQ+-6(y_* z2pqz~90*;x9}yM}%$UI(7t#$DK_3Se1{4HKM+6iG7EmeH6$V631{L5n)#CyC0qx-* GApkoMokrLI diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif index 21c0c6530847f73e43881e6c631c580517d42e8a..6a11e70652d32206d792fe00b8f0ec9fbfd6b759 100755 GIT binary patch delta 183 zcmV;o07(DP1i=KblL3D}04x9i000sI5&!@Po`64sgM@{KE+Z5eDuOR1ij0IZ1r8b( z3K1ogmIWh(5*;8PARrYC9HJl{4kv;%7abn59;6?$9UTRNAsV)`zq23+f+!chz_%R@ zf-nNO$iWL6gChj0&>#>1g%b=Q$R8O2D~13W-@hOSB8ERL0vs=~ve^dhf+7mnAQuDn lg9#Q?bs&(!-yi~^7LYJFNX3B%5f~COu}vZ&7WM)G06QI%H532< delta 198 zcmV;%06G7`1kePqlL3D~04x9i000sI5&!@Pt$;v+gM@{KE+Z5eDm_3iC5kFMgfayV z8Wsu>C6<^4BZEH@9UvbdAQcQ8r63&+CxSE=9UiqFrysT*9R)c+AsV^1!?qv@F+eC6 z!o<2A4LU$D0=vz{3mbzY1g+K}5CAiSJ`)Te%^w*7D}^=y8RtI3AO|9bKrI3sw6)&` z_JSf5bOUi=z>R-`5?E-}fj|m`f@%;TwSWY~K`IVBh%o7*AQJ#^cpS8Y#lJuRJGVkR AApigX diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif index 334d49e0e60f2997c9ba24071764f95d9e08a5cc..9d747140ec21648d6d284ca220cc8e768add64d5 100755 GIT binary patch delta 221 zcmV<303!d;0000005&#ka00pk# zCyr!U5{BnxNQ-0!L8in)A=NWYPlZq^!^dC8~h450{t2%!voBMKXh2?Bwd7@i{(6|;=Lj2jhwBpMM*z)cYv XCT000005&#ka00qt9 zCyG*Omg9I3hUaBSjARB89AZl>6jD8t$)kdxvA)rw_HV+2l`A}#M0naBe=qenQ zu$Y4wWCD@^q7Z32-f#zJfR<1?8^#6D=yV!<9S;>-P6s&GEs;@h@nM(B2QfX|Ns9Lf3h$#Fvv6LFaQBahJkg(1NFX?%)Zmb zGUto>jy4KRa#3(EEE0aGD8_xrc}9U3cUwwAqSJ_`^2r6M%J8sMF6EPA;c-{v7Iu)6a}r*t P&TZp%UjM4HB7-#m0d+qM delta 254 zcmV000005&#ka00qzB zCyG>QmSaj*%X1vhQc)^d90(yv1acI#RDv@hcn}r~!b6yF5+lljAsJY#*Q&iIRgMdqmd6d$8MrXug^7ceN71oVSO479Sw_&9tVVmhz$mdl#P#R zdjt-Z3NH$l9TpRW3rGzS3J|Ig3K0!T3keh%6CNEM5fB0b7ZJA}6B#85Qy!Zb7Z(@} z4jx>x9~2uL3&z-yb0W EJCedgx&QzG diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif index 1606c119e75678c4031f384e0d50849906e8f533..1bf29de795a9737ee78e6a492ba9ed50e931b721 100755 GIT binary patch delta 222 zcmcb?w26tw-P6s&GEs;@h@nM(B2QfX|Ns9Lf3h$#Fvv6LFaQBahJkhc1NFX?%)WLL zo=b&&Gmof>Of3j1OY(l?=+L3Q@xT;5F0PitD??@obR9CCq@m5*U>x1)6(H3wykPBw zxpKUrlNv0{d&~FC{!zE)oLAz10S>taxw0@;nfitfer_g#W)}{ziIXOBNc1XsvP(s< z@Gy#tGxD$$W+`*aG4YD?2n+Lw^K!{?t9Y!CW|_a3NiJAbmWxxATbh|$l#@$Vot<0C W$zF;(M4w%jn_KpZ{v8!X25SJ3IX)c# delta 260 zcmV+f0sH>40@wl!M@dFFIbjk25&+Z_kqlmc0000X`2+y~03QG>000005&#ka00q_H zCyG;PmSajrhcpb*5lt$YNnAov2`6Q=lmW9ycpylKC$Yd7Mw5er0^x8f6)S|IIM5~$ z3ANGyV9S-QWERzUumE!f-8A}tX$cYrc@$U`1&R*>0uPTKgoXtij*pjb z4+{bil6ngW7NMe{2pF7&2O4Aq3;`Dx0Sp9xcLoy<3myUu7Yro~7Yzy?3l1d)Qo0)i zud@OkUA7++7aa--6$={!3l#|p9T!0#1{Vhl8cIhR3kMfZDbx-J9SaK`2M*#j)8!2R Kz@&``0RTH#{zUBn diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif index ca2451e102722e12e131ae53ea76989acbf191e2..1e8ccd0f3d307ee3462a00e310e7134544accec4 100755 GIT binary patch delta 207 zcmV;=05Jc-0;2*9M@dFFIbjk25&(oBkqlmc|Ns9X`2+y~03QG>000005&#ka00p4n zCyr!kj>N+-4{@T5b~MeQF|PRx_2D>&+2BzkXljq&?=jQlM2vKWI3xg( zgyS0qCUQ)lLjVx3+d<+d`h$QA1$zX4*v_Rt0(f{GgMA_c2Lu@!gN{1~10!Mv7M7Pf zmIh-_i4Oo32o<0e00NODMjQ(Zp`Z&D7fvMu7poWu2p9_&0+J>Zsu;q$15YLatH}!i JFU=+)06S|5L*4)Y delta 237 zcmVJ_dM@dFFIbjk25&+Z`kqlmc0000X`2+y~03QG>000005&#ka00q9_ zCyG>QmSak8#KSNTu~8~XFxt^HhsF@J6y-7C9UP8>Ztw_xCImmS09=bT}TjZ1qFl=h6fBKf_R389gvG90|x|H z85)qAL000005&#ka00pAp zCyr!kj>t9)8*+}0;T@WGc!qOEorFP;2LvPOL`sN-W)pd2o)L&<;Tjnxd2!s7Q4I_)0SG)s L2mvq8CLsVjIMzcc delta 241 zcmVuIhM@dFFIbjk25&+Z_kqlmc0000X`2+y~03QG>000005&#ka00qL} zCyG;PmSaj5$TkccQcNo87~Y|2hi5pnlp@lRU?7hN1S9E06r%}Zq1i+pnQR22Ss-W= zjzN=ocs$uNR%76l5D!U~0+`n`lE+tJkY@pRfLVA33VdX96bS+p6atSDg@+Fj1}~Rf zmkW`GeGw<069yTQaGnH)s0suVR|pCd0ZtRCsjM9VB^L+~7X%f*zyuc%2p3=#ycf#L r%McYo9|{Z&5D^#_78qL%3{WW(7Xb)FP6z?UH6ODVz!ev-DIowml2Alc diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif index e6a9e60d5ddd1243fbbf2197b4dc6cd9c1b58b93..b9bff40a4381c4f36c99367c7213a60c79a4cf1e 100755 GIT binary patch delta 222 zcmcb~w26tw-P6s&GEs;@h@nM(B2QfX|Ns9Lf3h$#Fvv6LFaQBahJkhc1NFX?%s#hg zl`{+bjua_QYKh@44CCA6%X2KHxgf-=ttF*sC(CSM&qJnBI+DDu2HI0}0$O?576ZquO$vw*jO+#%QQ>J%U9JlcQrQ&x8?FM%XK%)G4p#0SID!m z^2jjBayE0yGRg2{D~a$)*U2($V34ho=2P)p%g@Ke#J43_Rf?0NrjAE~gHuYKjgQsY Vo|P{|pG}I7PwI;P9Ti0eYXDSkKDz(_ delta 261 zcmV+g0s8*30@(r#M@dFFIbjk25&+Z?kqlmc0000X`2+y~03QG>000005&#ka00q|I zCyG#MmSajrM&@~$5kV?REEgh4$h8o()S==)Y$goGWP@;24kL&mA(>n*$?HUtFwh{8 zMU~M|B+E+4VkRwYFc^gbE{AUl-a`g4fp;2yfEW`983zYqa2N~^4;%vn9FiLghlz}E zl9`f`6P0=h3Vl9SM>N9ReH-cn1&^4jYXf0KotqjT;UWC94U( z4-NtX4#i!%9}pHA2?&dg3>XLr8Wuqx2Nnhn1xrT-4h9xbDb^GQ8V(K`1{C5o)#U;I L0p5-K5CQ-@sQX4B diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif index cb99cdd9136fa30462a9f57aa6a0adeb7e4124e7..b074653260bf0697263d6a6c381ddac84f5dd56e 100755 GIT binary patch delta 219 zcmcb{w4RB_-P6s&GEs;@h@nM(B2QfX|Ns9Lf3h$#Fvv6LFaQBahJkg>1NFX?%)Yi` z2D1wLTDRp~-l7{-Xy*Tjb86Rt$rUDEY)4%#tng5o+Lo}Wpw~p$Cv{;(k@k#Ewyh6r zWIKwZ4n;_KEg}+CwnBaU3=C3keXtm1U8cqrtVRY4JvxP*q+oP9ZKy$yiP000005&#ka00qZ6cm$P-z>|114kL&`F%dK>5=o^Ym?#W1 zNJKNiR2GUXx`LT#X3_;G>p;-$63zmA&?GQf2zY{77zr8&eG^#{4h{qzjuev|h>BTl z1Ou9zlN1=1MG~D4000`D9T*RZ1`DE-2&D*}5_<;_77rYd9T}wn9UTN54;Cc{Q@fF} z!W>_>9}pJ}3JDSl85wB_3Jn)Q9|so(4+|I^92g4^1{Y8%(iR3pP6ig=HPPY$`~mLZ IA3^{CJ4w7qssI20 diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif index 2075dc16058f1f17912167675ce5cfb9986fc71d..48867dc2621793aa4422fcb3a27d5993384e92da 100755 GIT binary patch delta 206 zcmV;<05Si_0-^#8M@dFFIbjk25&(oBkqlmc|Ns9X`2+y~03QG>000005&#ka00p1m zCyr!kj)&DW)^UzS!zt6Ga82=AiX#1zp5;+GBqkCLN25_nCJEQ5fz(76%&X?vKsgl5 z1y&}akM@dFFIbjk25&+Z`kqlmc0000X`2+y~03QG>000005&#ka00qV1 zCyG>QmSaj*ht)LJQBf*cG@LR`3fC006yjk~C?rUU(eglyD2K#E!r^E%RmmiApiwG~ zsV1_xk~P}K4C+u^7iA6ns&I4>MTt4GzbY*V2w_)O9R>r4i3$yYgBpj4kpmKpcy5wk zk{uF&2nP-t0s;w<385Nx2oxDb9T5Pp7qJl?3Kkh9oe2sCr5F$p7zPSlsUH*@54w*8 u3=9Or4;w)r2pcU95(FL|1Th;;>-P6s&GEs;@h@nM(B2QfX|Ns9Lf3h$#Fvv6LFaQBahJkg(1NFX?%s#hv zg}H^3cqcmq95OlbGQjg&$W(VV$HFN*awqst)Hv9z3v||;!O;-fxVbSY#cUR9I`g$2 zrd~%$fJEb}0+|<}ac%1BbL;}^t P*sNX8>0eb*WUvMRQO-d& delta 253 zcmV000005&#ka00qwA zCyG&NmSajvMu#AsAw?=lG)w|P3DXd?)WJbXWFD2uBa@&w4x@;{13@OQ4~WM=i%1$( z!9(e;W@89R~+savmN91s4 zlf+xO9}yT19toMv8wnl`7(pKg7zPv!OGgY81{hE&(iR3pP6ig;HPPS!_yOwPA0Yrc DPx#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX0|pj40fFXX)c^nhLUct~bVF}# zZDnqB07FtmK~zstIv{6cEoyLOXCQVlE-)Y{b#rNMXCO&RM<7a2MMofZHZmzJAaQkJ zY-x0PAUz;4Ffag_u6|INeD1xzz~SZLzNH!3)TW2d;kfG4vgCX3ZOa|05Fn(Y)aq( z1CedhZhkHAZ<9_YSXZE2U7)_}xT)6PAtX+&0Ejw`n69Lg2=p(CNsRp1dTy+03@5=>;B!(dG48n5H^^LbG+{X z5HycCKr*P&-8{&P$38MSM{q_MV?Y{_ra~HU^|zDCdnoNz^~o~&@{6iQ{nwQ|JfXKw zp2vMMC7wRm<>-+ixdLa;4mkD3X)2|NsIWk( z_CCF>H+ka8f{`p{dwZK!^O_DH-j9oG$a@G)?zg_7Ub#%6utu;M!S7`>K1!iPRG?HWW5_XNL@w~bnfF*-S>d~H&(msdaO3(K%O8J6kmZ#V$AAe^#%P=ZF<>!1 z%jqQ@mCFU@D!T|cEFPH9`uirAuil{E*v-k;UZqs4fntJ*84mgsBT+2R8wk^@ZS^{G zkx0Fx(O5zVOFFX->=+6=n;>F5*`g4Ga}@&+K_K8*?{p{@W2)6E)|SXA;wbL$1i%RL zET!9Rk>@Fk3;S@TnY%*>v!}`!jk=mldXl^pq#M_7Y0w{OJjoR#1xf9DO)1}EkUUhs z*PVGy7zNEH4-AJR#gV1I*}>;S_UxTE-Ckd%N|hu@a5iT5;(jw%Y=G=++v(aS$YYom zgWu*+=Yh(#Dz(~z$*~x~5qLc8E6pa%&o3FtAp-{OU}qMYg*;O=Ktx~+(*J+}X4*Z> e#J4*~fd2qjcOya))CaTx0000*&4%AI#EUSQ(Y=E5TJrNpY=he;NHa4_cS$A5H??+6?CRw2E#~%T=9$#R z!z{qxAkP*l&BQ0(CC4A|)WemyyA@SxQ8OO;)OvQ=3zOJ2ga^SC(C_^@tq1 bth*YU2#d2li^y>`Q8pX5+xm}`6&b7nFbqK3 delta 267 zcmV+m0rdX30^b4*M@dFFIbjk25&+Z^kqlmc0000X`2+y~03QG>000005&#ka00rFO zCyG*OmSajz1}6xdF-a;}FvJl>2f-Ay6rw>nXdWKVLvx@s5F?2p5kV$Boz5eYFwi6u zMx;UTWI7&)LK$Jqqy$Yz0RSW{3Wdd@A$SoS2M-n*2^o714toy=90&+vdwUBI8v_G& z8<`pmkCBv_pqZEtoPY-l0}P>=3WE z6cr`19U7DgF9{F}at6R35*Q5~2OgBy9tRx_7(pKh7zPvsOGgA01{hE&-4zBzP6id} RHMp@0Krnzkbss_i06WSpLAL+^ diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif index 648e6e879123fe49beebbc1f3635141864a79a9c..5296c883656c866cd6a0b24a13904896bfd01ac2 100755 GIT binary patch delta 214 zcmV;{04e{_0;&QGM@dFFIbjk25&(oBkqlmc|Ns9X`2+y~03QG>000005&#ka00pPu zCyr!kj)qngnsJWJ_Z-)CJX&lz-f>`+3dZMglnjXrFv!GQ60VWvnP4&#NeybY5Og>} zPDik~MK!-gMFDU)0E)_DsQpYAi7|)4fOI+@0|#|?3j+~-5PT640~mEZh65TC76cPP z1&xj#A_fnJ2?PNM2mu6v3lC8rks1K6umxqDC Q9;+t?JVnkg)FUAPJ6zB~g8%>k delta 252 zcmV000005&#ka00qt9 zCyG*OmSaj%hE^1sK}jmvXwPw7$D=j06vE*-959s%#^`Y%MiN8ff=pU5mxO^Pp=h!R zt2Hsz%%Zu4puLMV12^6BYy$1)ZKAga!|m2?POz0R)f>4+aPl8KD{gz`+G_9vLMFQU?RU z!8uyH9}*i52|cC+7S0YEK_3Vk1|APfM-Ltb8&4_H83sg61{vHn(cc000qNZzApkqL CGDq0} diff --git a/include/text.php b/include/text.php index e7c95d35..5ad0154d 100644 --- a/include/text.php +++ b/include/text.php @@ -782,8 +782,8 @@ function smilies($s, $sample = false) { '~friendika ~friendika', '~friendica ~friendica', // 'DiasporaDiaspora*', - ':beard', - ':whitebeard' + ':beard', + ':whitebeard' ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);