aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-06 04:28:45 -0800
committerfriendica <info@friendica.com>2012-03-06 04:28:45 -0800
commiteec4cff84be630bf3a4165321a423c29ed7926e9 (patch)
treee56def79f18969085ce17d2622074809652363db /include/text.php
parent23718bfc259c00e87e3845ba4b1ead52ca7c6559 (diff)
downloadvolse-hubzilla-eec4cff84be630bf3a4165321a423c29ed7926e9.tar.gz
volse-hubzilla-eec4cff84be630bf3a4165321a423c29ed7926e9.tar.bz2
volse-hubzilla-eec4cff84be630bf3a4165321a423c29ed7926e9.zip
remove "smilie" expansion for Diaspora logo
Diffstat (limited to 'include/text.php')
-rwxr-xr-xinclude/text.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index 042ee982c..c8c03174e 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>',
);