diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:38:44 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:38:44 -0500 |
| commit | 415ca107fd61562dcec41fb336efdfde58d32c8b (patch) | |
| tree | 23860d3717823e3dd47304b8ee8ab2b741097f7d /include | |
| parent | a33ca0a7318cf727b5c605c381e4c6f20463ad3e (diff) | |
| parent | 496a0ce4d110e5a777861aff7cd4c82fe2308c89 (diff) | |
| download | volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.tar.gz volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.tar.bz2 volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
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); |