diff options
| -rw-r--r-- | images/diaspora.png | bin | 0 -> 461 bytes | |||
| -rw-r--r-- | include/text.php | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/images/diaspora.png b/images/diaspora.png Binary files differnew file mode 100644 index 000000000..725fae718 --- /dev/null +++ b/images/diaspora.png diff --git a/include/text.php b/include/text.php index 7b43cd340..0641689d5 100644 --- a/include/text.php +++ b/include/text.php @@ -671,7 +671,8 @@ function smilies($s) { $a = get_app(); return str_replace( - array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '~friendika' ), + array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', + '~friendika', 'Diaspora*' ), array( '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />', '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />', @@ -690,6 +691,7 @@ function smilies($s) { '<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />', '<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />', '<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>', + '<a href="http://joindiaspora.com">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>', ), $s); }} |
