diff options
| author | Abinoam P. Marques Jr. <abinoam@gmail.com> | 2012-02-19 09:58:41 -0800 |
|---|---|---|
| committer | Abinoam P. Marques Jr. <abinoam@gmail.com> | 2012-02-19 09:58:41 -0800 |
| commit | a9ed5915cebcf51347acaad51d0c252e57bceaff (patch) | |
| tree | d4f271b8f96387338f8932ee6156311940bdf6eb /include | |
| parent | f81e9ee3b2ef79d14ebd6ef844a62e7dcf210a61 (diff) | |
| parent | 49179f9033e875034bbf97cae64b58a4f0871c7f (diff) | |
| download | volse-hubzilla-a9ed5915cebcf51347acaad51d0c252e57bceaff.tar.gz volse-hubzilla-a9ed5915cebcf51347acaad51d0c252e57bceaff.tar.bz2 volse-hubzilla-a9ed5915cebcf51347acaad51d0c252e57bceaff.zip | |
Merge pull request #40 from simonlnu/newsmilies
add :headdesk and fix doc/Pages.md to remove the absolute URL to /
Diffstat (limited to 'include')
| -rwxr-xr-x | include/text.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php index 45881b9a6..b9813cfa9 100755 --- a/include/text.php +++ b/include/text.php @@ -716,6 +716,7 @@ function smilies($s, $sample = false) { ':homebrew', ':coffee', ':facepalm', + ':headdesk', '~friendika', '~friendica', 'Diaspora*' @@ -756,6 +757,7 @@ function smilies($s, $sample = false) { '<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />', '<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />', '<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />', + '<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/friendika-16.png" alt="~friendica" /></a>', '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>', |