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/bbcode.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include/bbcode.php')

diff --git a/include/bbcode.php b/include/bbcode.php
index 1df2ad725..cae867eb8 100755
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -174,7 +174,10 @@ upper-alpha;">$2</ul>' ,$Text);
 	$Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>' ,$Text);
 
 	$Text = str_replace('[hr]','<hr />', $Text);
-	
+
+	// This is actually executed in prepare_body()
+
+	$Text = str_replace('[nosmile]','',$Text);
 
 	// Check for font change text
 	$Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm","<span style=\"font-family: $1;\">$2</span>",$Text);
-- 
cgit v1.2.3