diff options
| author | friendica <info@friendica.com> | 2012-02-11 21:46:48 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-11 21:46:48 -0800 |
| commit | bb19c8ba4ea279265ad146f69949a62b4024c2ab (patch) | |
| tree | a871904ec5bc5d91925b1c5c06ba1dd98278c8f8 /include | |
| parent | d856ae1fa527772ebc9194f25a1e55df614b8f3e (diff) | |
| download | volse-hubzilla-bb19c8ba4ea279265ad146f69949a62b4024c2ab.tar.gz volse-hubzilla-bb19c8ba4ea279265ad146f69949a62b4024c2ab.tar.bz2 volse-hubzilla-bb19c8ba4ea279265ad146f69949a62b4024c2ab.zip | |
kissing smilie may need escaping (thanks - Abinoam)
Diffstat (limited to 'include')
| -rwxr-xr-x | include/text.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 9aca14598..9e67d36a9 100755 --- a/include/text.php +++ b/include/text.php @@ -678,7 +678,7 @@ function smilies($s) { $a = get_app(); $s = str_replace( - array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', + array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', ':beer', ':homebrew', ':coffee', '~friendika', '~friendica', 'Diaspora*' ), array( @@ -693,6 +693,7 @@ function smilies($s) { '<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" />', '<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />', '<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />', |