From 06408664db04cd1cac255d21e7bab54e6ba0c047 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 10 Aug 2011 05:28:39 -0700
Subject: [PATCH] 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 0000000000000000000000000000000000000000..725fae7181f37aa10d88bb49193fa0320aaa2bff
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0004mNkl<ZIE}56KS%;`6vw}MWqVY1A{-XyaEpUmB1A2Rfgq^JZGl@*1Wpb@
zix3DpI0Q}+NVr6s5Cm=|Qqka6TM&VZ5=EDN8}i`Cac2ZQ_`&1xeV_N|_dFyC2OEt>
zhwXM-27pW^QwPv>(t$3f>v~_7Wy-Qll36#M*OB@M`!_(TQmLE)SO?&nqF(~Amq;Y~
z09FC~>>!;^-%REm=W@9&$?bSN{vhn2)a&)?nx+ke*e*$WNQM<fxi?L7&Q|S9=uq?l
z0NHHzvR12YcmW`v&tFKAWV(!J_u=>ZpR3jCHGmoM8<$BIQmNE!AQ1SpTD6|4s>4R3
zaY}NFq+}&I-GLekg<kD|X0v(XbO(08Y_V8u3yEXF{~($84X`65jY%FvB9Rvh5{tzi
zNiMhn!m6qcEwN!3S0sHT4Y89}t99%KC|JT^F!)Y#Z4#Ht<?^`&h(@DNBp00k63Kl<
zQQkV8&XH}j6;0Cy$z<}5q&95_B)KV85KJdIZx4P0Z!YyI;J}Gn00000NkvXXu0mjf
Dw{pKS

literal 0
HcmV?d00001

diff --git a/include/text.php b/include/text.php
index 7b43cd3408..0641689d50 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);
 }}