From c506bb42a93be7bfe3d2066e60d08b87ba3275af Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 7 Feb 2012 17:03:09 -0800
Subject: [PATCH] :coffee extended smilie

---
 images/coffee.gif | Bin 0 -> 231 bytes
 include/text.php  |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 images/coffee.gif

diff --git a/images/coffee.gif b/images/coffee.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7e20371741a6047a1e2bbe2548eee785de40d318
GIT binary patch
literal 231
zcmZ?wbhEHb6krfwIKlt||NsB*NoJ^y5_tCP*{xf*wrtrlYt}4ZUtcpbGhJO>Sy@>r
zDJe-wNpW#;0RaI<Mn<4|us)&)#h)yU3=Dz{Iv~{`I~iD05>(tABKuZEu<2AUW3WE6
zx%-&Yy4MG#r*FA=N=#WqLd~J^g3^>3txbtiyaEDx3?W{+5nF8wO0rg1%{+f#N49Os
q_7vmOn$M=~)n({p=#4(CoK$C~!R1xRz$c)o%+1TmU)7_?U=0BKd_GJ7

literal 0
HcmV?d00001

diff --git a/include/text.php b/include/text.php
index 8206ba7e92..9aca145988 100755
--- a/include/text.php
+++ b/include/text.php
@@ -679,7 +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', 
+ ':beer', ':homebrew', ':coffee', 
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -705,6 +705,7 @@ function smilies($s) {
 		'<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" />',
+		'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
 
 		'<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>',