aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasudev Kamath <kamathvasudev@gmail.com>2012-02-14 09:43:05 -0800
committerVasudev Kamath <kamathvasudev@gmail.com>2012-02-14 09:43:05 -0800
commit8022a469079a0a0a32c6ba1482e434b82b23608a (patch)
tree6bacfc93eb3e2f25688f0dbac8ce2a26c7280482
parentd2a9ce9362ae5983b633c3a249f397733c9d9f03 (diff)
parente4b1c07727c2c96e1752668c09ab82015e209a1f (diff)
downloadvolse-hubzilla-8022a469079a0a0a32c6ba1482e434b82b23608a.tar.gz
volse-hubzilla-8022a469079a0a0a32c6ba1482e434b82b23608a.tar.bz2
volse-hubzilla-8022a469079a0a0a32c6ba1482e434b82b23608a.zip
Merge pull request #35 from copyninja/master
:'( :-! :-/ 8-) :-[ smiley's are mapped.
-rwxr-xr-xinclude/text.php9
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( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ';)', ':-(', ':(', ':-P', ':P', ':-"', ':-&quot;', ':-x', ':-X', ':-D', ':D', '8-|', '8-O', ':-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/',
+ array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ';)', ':-(', ':(', ':-P', ':P', ':-"', ':-&quot;', ':-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" />',