diff options
| author | friendica <info@friendica.com> | 2012-02-06 01:08:00 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-06 01:08:00 -0800 |
| commit | 3d099bd99abe6431103112bfe1eafd96a61c6767 (patch) | |
| tree | bbf4e5d500dadb33703bae1c66c8ce31d2229f38 | |
| parent | 57f70837064c1a8fdd2468307bf11e1da30959cd (diff) | |
| download | volse-hubzilla-3d099bd99abe6431103112bfe1eafd96a61c6767.tar.gz volse-hubzilla-3d099bd99abe6431103112bfe1eafd96a61c6767.tar.bz2 volse-hubzilla-3d099bd99abe6431103112bfe1eafd96a61c6767.zip | |
beer
| -rw-r--r-- | images/beer_mug.gif | bin | 0 -> 1032 bytes | |||
| -rwxr-xr-x | include/text.php | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/images/beer_mug.gif b/images/beer_mug.gif Binary files differnew file mode 100644 index 000000000..a047d1987 --- /dev/null +++ b/images/beer_mug.gif 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( '<3', '</3', '<\\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>', |
