From e4b1c07727c2c96e1752668c09ab82015e209a1f Mon Sep 17 00:00:00 2001
From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Tue, 14 Feb 2012 23:10:11 +0530
Subject: cry, foot in mouth, cool, undecided and embarassed smiley's are
 mapped

---
 include/text.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'include/text.php')

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" />',
-- 
cgit v1.2.3