diff options
| author | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
| commit | b0d52943e85bf819d4ddf91127ca25ec7a32c289 (patch) | |
| tree | fcb7c92735bbcbae9359d3fcf91a185226698426 /include/text.php | |
| parent | 1a3be504516db7106ea0ce385691e5a3eca4c084 (diff) | |
| parent | c5f4e5bac76de93b30c00fa9fb3dc8a559d7b070 (diff) | |
| download | volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.gz volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.bz2 volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/text.php b/include/text.php index 680e6fe95..d3d8b84a6 100755 --- a/include/text.php +++ b/include/text.php @@ -1002,9 +1002,9 @@ function smilies($s, $sample = false) { ':facepalm', ':like', ':dislike', + 'red#matrix', 'red#', - 'r#', - 'red#matrix' + 'r#' ); $icons = array( @@ -1040,9 +1040,9 @@ 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" />', + '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red#matrix" />matrix</strong></a>', '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red#" />matrix</strong></a>', - '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="r#" />matrix</strong></a>', - '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red#matrix" />matrix</strong></a>' + '<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="r#" />matrix</strong></a>' ); |