preliminary qcomment support, [nosmile] tag to disable smiley processing

2012-02-14 23:13:18 -08:00
parent f865939653
commit 03171fd7de
7 changed files with 45 additions and 4 deletions
@@ -212,7 +212,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 	$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text);


-
+	$Text = str_replace('[nosmile]','',$Text);

 	// oembed tag
 	//	$Text = oembed_bbcode2html($Text);