diff options
| author | Chris Case <kahotep@bunda.dreamhost.com> | 2011-02-14 11:50:08 -0800 |
|---|---|---|
| committer | Chris Case <kahotep@bunda.dreamhost.com> | 2011-02-14 11:50:08 -0800 |
| commit | 7b265005107f12fa1e5768853e280a8f0b68eeac (patch) | |
| tree | 8d178994704419c8f9b93289913af92a61caa2e8 /boot.php | |
| parent | 42eb6dd723abd31aaaf6c1608f2dec645f4e20b5 (diff) | |
| parent | fe1a37074af43f17aac5859b1aaf37fde4b58ae9 (diff) | |
| download | volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.tar.gz volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.tar.bz2 volse-hubzilla-7b265005107f12fa1e5768853e280a8f0b68eeac.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1978,8 +1978,9 @@ function smilies($s) { $a = get_app(); return str_replace( - array( ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), + array( '<3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), array( + '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />', '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />', |