aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-05-28 16:33:24 -0700
committerfriendica <info@friendica.com>2013-05-28 16:33:24 -0700
commit6bb35832674e35aa4505cd636b6f42c6d0a1a7f4 (patch)
tree89aeeac25abedeec92a1a6503ec7db1877eb4189 /include
parent281d73b03adb4906acd9483911aa8edb04e68f6b (diff)
parent5f629ea6102acb0c117c2152e5bc7404b3b8b668 (diff)
downloadvolse-hubzilla-6bb35832674e35aa4505cd636b6f42c6d0a1a7f4.tar.gz
volse-hubzilla-6bb35832674e35aa4505cd636b6f42c6d0a1a7f4.tar.bz2
volse-hubzilla-6bb35832674e35aa4505cd636b6f42c6d0a1a7f4.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
-rwxr-xr-xinclude/text.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index 086104466..f10541144 100755
--- a/include/text.php
+++ b/include/text.php
@@ -891,6 +891,7 @@ function smilies($s, $sample = false) {
'<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
+ '<img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red#" /></a>',
'<a href="http://project.friendika.com">~friendika <img class="smiley" src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
);