aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--images/beer_mug.gifbin0 -> 1032 bytes
-rwxr-xr-xinclude/text.php4
2 files changed, 4 insertions, 0 deletions
diff --git a/images/beer_mug.gif b/images/beer_mug.gif
new file mode 100644
index 000000000..a047d1987
--- /dev/null
+++ b/images/beer_mug.gif
Binary files 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( '<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>',