diff options
| author | friendica <info@friendica.com> | 2012-03-06 15:29:18 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-03-06 15:29:18 -0800 |
| commit | 496a0ce4d110e5a777861aff7cd4c82fe2308c89 (patch) | |
| tree | 679f1b68155f65c8148716c2107167e879cd3300 /include/text.php | |
| parent | 7431bd950937929a21b7d158564a8f9a80d07c5f (diff) | |
| parent | 1fae778421253b713c166f3e4d329997a9e214a3 (diff) | |
| download | volse-hubzilla-496a0ce4d110e5a777861aff7cd4c82fe2308c89.tar.gz volse-hubzilla-496a0ce4d110e5a777861aff7cd4c82fe2308c89.tar.bz2 volse-hubzilla-496a0ce4d110e5a777861aff7cd4c82fe2308c89.zip | |
Merge branch 'pull'
Diffstat (limited to 'include/text.php')
| -rw-r--r--[-rwxr-xr-x] | include/text.php | 6 |
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); |