From d79a2e3b55c7cf6c775b8ecf7fbf708248aa16c8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 28 Jan 2014 16:32:47 -0800
Subject: undo pull request #287

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

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 4cb7a1d5e..a459296cb 100755
--- a/include/text.php
+++ b/include/text.php
@@ -891,7 +891,7 @@ function smilies($s, $sample = false) {
 
 	$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
 	$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
-	$s = preg_replace_callback('/<(.*?)>/s','smile_encode',$s);
+//	$s = preg_replace_callback('/<(.*?)>/ism','smile_encode',$s);
 
 	$texts =  array( 
 		'&lt;3', 
@@ -984,7 +984,7 @@ function smilies($s, $sample = false) {
 
 	$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_decode',$s);
 	$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_decode',$s);
-	$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
+//	$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
 
 	return $s;
 
-- 
cgit v1.2.3