diff options
| author | zottel <github@zottel.net> | 2012-03-22 09:16:10 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-22 09:16:10 +0100 |
| commit | 3f3c4aec79bf3ceedd551bae7cec7acfd68e3772 (patch) | |
| tree | ae5af3e8b7dda429b744c70ea3fda111c30b15c3 /include/text.php | |
| parent | 88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e (diff) | |
| parent | 576eb6cc389d54c29b29b97d3c6d160e61bbf6ca (diff) | |
| download | volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.tar.gz volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.tar.bz2 volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php index 527f3a344..92a74eb49 100644 --- a/include/text.php +++ b/include/text.php @@ -712,6 +712,7 @@ function smilies($s, $sample = false) { ';-)', ':-(', ':-P', + ':-p', ':-"', ':-"', ':-x', @@ -745,6 +746,7 @@ function smilies($s, $sample = false) { '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />', '<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />', '<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />', '<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />', '<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />', |