diff options
| author | friendica <info@friendica.com> | 2012-02-14 13:57:12 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-14 13:57:12 -0800 |
| commit | cbabf9d7ef4199bc9b2c2d50afd85a962de0cb88 (patch) | |
| tree | 533c68e18147ebff421950b7ddc92131661fed6e /include/text.php | |
| parent | 7697bde0cae15cda222351a9c1618418b00ef556 (diff) | |
| parent | 8022a469079a0a0a32c6ba1482e434b82b23608a (diff) | |
| download | volse-hubzilla-cbabf9d7ef4199bc9b2c2d50afd85a962de0cb88.tar.gz volse-hubzilla-cbabf9d7ef4199bc9b2c2d50afd85a962de0cb88.tar.bz2 volse-hubzilla-cbabf9d7ef4199bc9b2c2d50afd85a962de0cb88.zip | |
Merge branch 'pull'
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index 798e809d1..317028065 100755 --- a/include/text.php +++ b/include/text.php @@ -682,7 +682,7 @@ function smilies($s) { $a = get_app(); $s = str_replace( - array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ';)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', ':D', '8-|', '8-O', ':-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', + array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ';)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', ':D', '8-|', '8-O', ':-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', ":'(", ":-!", ":-/", ":-[", "8-)", ':beer', ':homebrew', ':coffee', '~friendika', '~friendica', 'Diaspora*' ), array( @@ -710,7 +710,12 @@ function smilies($s) { '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />', '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />', '<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />', - '<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-cool.gif" alt="8-)" />', '<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />', '<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />', |