From 3d099bd99abe6431103112bfe1eafd96a61c6767 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 6 Feb 2012 01:08:00 -0800
Subject: 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 000000000..a047d1987
Binary files /dev/null and b/images/beer_mug.gif differ
diff --git a/include/text.php b/include/text.php
index 5f4adb27c..70733bac5 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>',
-- 
cgit v1.2.3