aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-07 17:03:09 -0800
committerfriendica <info@friendica.com>2012-02-07 17:03:09 -0800
commitc506bb42a93be7bfe3d2066e60d08b87ba3275af (patch)
tree513191a2415268676d879421da7648845a7cd779 /include
parent8a3c1f79300152d9b65b419ee33d129829043126 (diff)
downloadvolse-hubzilla-c506bb42a93be7bfe3d2066e60d08b87ba3275af.tar.gz
volse-hubzilla-c506bb42a93be7bfe3d2066e60d08b87ba3275af.tar.bz2
volse-hubzilla-c506bb42a93be7bfe3d2066e60d08b87ba3275af.zip
:coffee extended smilie
Diffstat (limited to 'include')
-rwxr-xr-xinclude/text.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index 8206ba7e9..9aca14598 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>',