diff options
| author | friendica <info@friendica.com> | 2012-02-07 17:03:09 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-07 17:03:09 -0800 |
| commit | c506bb42a93be7bfe3d2066e60d08b87ba3275af (patch) | |
| tree | 513191a2415268676d879421da7648845a7cd779 | |
| parent | 8a3c1f79300152d9b65b419ee33d129829043126 (diff) | |
| download | volse-hubzilla-c506bb42a93be7bfe3d2066e60d08b87ba3275af.tar.gz volse-hubzilla-c506bb42a93be7bfe3d2066e60d08b87ba3275af.tar.bz2 volse-hubzilla-c506bb42a93be7bfe3d2066e60d08b87ba3275af.zip | |
:coffee extended smilie
| -rw-r--r-- | images/coffee.gif | bin | 0 -> 231 bytes | |||
| -rwxr-xr-x | include/text.php | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/images/coffee.gif b/images/coffee.gif Binary files differnew file mode 100644 index 000000000..7e2037174 --- /dev/null +++ b/images/coffee.gif 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( '<3', '</3', '<\\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>', |
