aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-03-06 15:24:15 -0800
committerSimon <simon@kisikew.org>2012-03-06 15:24:15 -0800
commit1fae778421253b713c166f3e4d329997a9e214a3 (patch)
treed9e51a0d8667cad5fcf3fc22cde9b7080ecb12a7 /include/text.php
parentdecc9e5798625f16c30a283483ee4323bc4b633f (diff)
parent67456bad067dd06c5775979c07c25c767164da36 (diff)
downloadvolse-hubzilla-1fae778421253b713c166f3e4d329997a9e214a3.tar.gz
volse-hubzilla-1fae778421253b713c166f3e4d329997a9e214a3.tar.bz2
volse-hubzilla-1fae778421253b713c166f3e4d329997a9e214a3.zip
Merge pull request #94 from beardy-unixer/master
Documentation changes
Diffstat (limited to 'include/text.php')
-rw-r--r--[-rwxr-xr-x]include/text.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index c8c03174e..e7c95d35c 100755..100644
--- a/include/text.php
+++ b/include/text.php
@@ -738,6 +738,9 @@ function smilies($s, $sample = false) {
'~friendika',
'~friendica',
// 'Diaspora*'
+ ':beard',
+ ':whitebeard'
+
);
$icons = array(
@@ -779,7 +782,8 @@ function smilies($s, $sample = false) {
'<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>',
-
+ '<img src="' . $a->get_baseurl() . '/images/beard.jpg" alt=":beard" />',
+ '<img src="' . $a->get_baseurl() . '/images/whitebeard.jpg" alt=":whitebeard" />'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);