From eec4cff84be630bf3a4165321a423c29ed7926e9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 6 Mar 2012 04:28:45 -0800
Subject: [PATCH] remove "smilie" expansion for Diaspora logo

---
 include/text.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/text.php b/include/text.php
index 042ee982cb..c8c03174e6 100755
--- a/include/text.php
+++ b/include/text.php
@@ -737,7 +737,7 @@ function smilies($s, $sample = false) {
 		':headdesk',
 		'~friendika', 
 		'~friendica', 
-		'Diaspora*' 
+//		'Diaspora*' 
 	);
 
 	$icons = array(
@@ -778,7 +778,7 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
+//		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
 
 	);
 
-- 
2.39.5