From 03171fd7deeb8e564478273ebdbee77eeab4a6cd Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 14 Feb 2012 23:13:18 -0800
Subject: preliminary qcomment support, [nosmile] tag to disable smiley
 processing

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

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 082d907ff..0cd7f114e 100755
--- a/include/text.php
+++ b/include/text.php
@@ -878,7 +878,10 @@ function prepare_text($text) {
 
 	require_once('include/bbcode.php');
 
-	$s = smilies(bbcode($text));
+	if(stristr($text,'[nosmile]'))
+		$s = bbcode($text);
+	else
+		$s = smilies(bbcode($text));
 
 	return $s;
 }}
-- 
cgit v1.2.3