From 8f381e01aebbddfed9f56ba21e18837e570dee19 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 30 Nov 2011 03:22:01 -0800 Subject: html_entity_decode D* incoming text --- include/bb2diaspora.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 036e6cdb8..eb709e01d 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -13,10 +13,12 @@ require_once('include/html2bbcode.php'); function diaspora2bb($s) { + $s = html_entity_decode($s,ENT_COMPAT,'UTF-8'); + $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); $s = Markdown($s); $s = html2bbcode($s); - $s = str_replace('*','*',$s); +// $s = str_replace('*','*',$s); $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s); $s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s); $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]',$s); -- cgit v1.2.3