Merge branch 'release-3.3.3' into develop

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index c664fd7d37adf67f8c4139a1fd3edb90487284c7..43b321e98a01f503ce960e8ae91e32b0eb3310c3 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1110,7 +1110,8 @@ function smilies($s, $sample = false) {
                ':like',
                ':dislike',
                 '~friendica',
-                'red#'
+                'red#',
+               'red#matrix'
 
        );
 
@@ -1148,7 +1149,8 @@ function smilies($s, $sample = false) {
                '<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
                '<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
                '<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-               '<a href="http://redmatrix.me/">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
+               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>',
+               '<a href="http://redmatrix.me/">red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red" />matrix</a>'
        );
 
        $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);