From 06408664db04cd1cac255d21e7bab54e6ba0c047 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 10 Aug 2011 05:28:39 -0700
Subject: Diaspora logo

---
 images/diaspora.png | Bin 0 -> 461 bytes
 include/text.php    |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 images/diaspora.png

diff --git a/images/diaspora.png b/images/diaspora.png
new file mode 100644
index 000000000..725fae718
Binary files /dev/null and b/images/diaspora.png differ
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( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '~friendika' ),
+	array( '&lt;3', '&lt;/3', '&lt;\\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);
 }}
-- 
cgit v1.2.3