From 3d099bd99abe6431103112bfe1eafd96a61c6767 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 6 Feb 2012 01:08:00 -0800
Subject: [PATCH] beer

---
 images/beer_mug.gif | Bin 0 -> 1032 bytes
 include/text.php    |   4 ++++
 2 files changed, 4 insertions(+)
 create mode 100644 images/beer_mug.gif

diff --git a/images/beer_mug.gif b/images/beer_mug.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a047d19873064afb3370f96d1a9a04ab5cec4c87
GIT binary patch
literal 1032
zcmW+#Z)g`(6unH#1-TZRK~O!3LU{BgBg%f!(+LxaOlY@YSue3d`Vd4>LB##dz|n_@
zniGQR{R(UAG;~N2SmTYz0vo9C`eMP8{(v7UR(;SYI=$_{<DU26a4+Ycw`1q%om=(}
z$&g%>6?9imceQlet-FH79~M76wd@0YppW9C`UoHCO}wc$c%x6^lllao=(G5&KEr4F
zD!!_(@Rgq8sh;qpim0dxRH#nWsXC~m2GO7zpn)1iqiTdks)?GaL5-S3lWKw{Y8K6^
z8Jek8w5nEUrBaltgpwv=O)W5?IWec^V2&2Vf?9wDS`>?F5f*7CW@-jAS`tfY36^MC
zEURT$rd6@3R$-M!X+s%dBt#$z0fcY@r*MEHf*>dY5Qr#<iU`D}X=5o2O^hT+iUcGg
z3$h{unW%!Qs6Ztspn?EdM2ct;6k%~voEC@TSb~(GC7=YBC?#r%D3Qgam=;4ZmLw%<
zNhpaWOUYU?N@l52s+NjUStx~Ch(fN|**ZI+Q@TdTAPmX?1~LkxGJ=uKZkp22d|?tM
zWdakKg;|-wOjco4R<M$6E5gzexy0MZC&{-~X!EqKO~ug6l_Zi>5+qTwNLI;^OsOJO
zr9vuOj+*6O#EW`qgx-mF>K(kJ58{LJpXFZfNQ*RE&YNPjwAxt1E$y-Wgdvgs--K8E
zJ9+-yjjvq1a^d(L^Y3lle)iFwhxVTy?3-M3b^pj?$M)@b3coLWdFk|-(W%QXyLR()
z=WiU{UjADc>2}YZd}!U;H^y%6KezSu0|WiH|2(*@w-3K=d-mi5-%d=g8yy%fGv)Xb
zAB_C+$4_J5;qdzP`pENh!?U|ye%r6@?4HxPcmBL?`LA-r!xIPkrtdnqVR+Ng`=2@S
zRp*-Vk9M6Mn7!}rOLYNf=1-iOdho);ORrsZ;nT?t<C_-82WQ{^dUx;eJ>T@M?;Pw+
z{W#NqWZ;Vzj*UJ3{n5|goO^N0z0>|y?0I_6p_z@-{?*PWpUwaM@&23E^hxJ`*5Lx1

literal 0
HcmV?d00001

diff --git a/include/text.php b/include/text.php
index 5f4adb27c3..70733bac5a 100755
--- a/include/text.php
+++ b/include/text.php
@@ -679,6 +679,7 @@ function smilies($s) {
 
 	$s = str_replace(
 	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', 
+// ':beer', ':homebrew', 
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -702,6 +703,9 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',
+//		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
+//		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
+
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',