From bb19c8ba4ea279265ad146f69949a62b4024c2ab Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 11 Feb 2012 21:46:48 -0800
Subject: [PATCH] kissing smilie may need escaping (thanks - Abinoam)

---
 include/text.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/text.php b/include/text.php
index 9aca145988..9e67d36a98 100755
--- a/include/text.php
+++ b/include/text.php
@@ -678,7 +678,7 @@ function smilies($s) {
 	$a = get_app();
 
 	$s = str_replace(
-	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', 
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-&quot;', ':-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" />',