diff options
| author | friendica <info@friendica.com> | 2012-03-06 17:22:13 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-03-06 17:22:13 -0800 |
| commit | 1224e256b1aba0b52bd64f63204b29d0ec86e813 (patch) | |
| tree | 0932fa431a118c9ed9c73ee2dbf2ec804cfefe8e /include | |
| parent | 88cd5800cf2e22f365bc38f567fcc1627e9278a7 (diff) | |
| parent | fdd269228b159709f5d0f3cf9bb7a23d2c046255 (diff) | |
| download | volse-hubzilla-1224e256b1aba0b52bd64f63204b29d0ec86e813.tar.gz volse-hubzilla-1224e256b1aba0b52bd64f63204b29d0ec86e813.tar.bz2 volse-hubzilla-1224e256b1aba0b52bd64f63204b29d0ec86e813.zip | |
Merge branch 'pull'
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index e7c95d35c..5ad0154d7 100644 --- a/include/text.php +++ b/include/text.php @@ -782,8 +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" />' + '<img src="' . $a->get_baseurl() . '/images/smiley-beard.png" alt=":beard" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-whitebeard.png" alt=":whitebeard" />' ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s); |