fix D* links+text smushed together

This commit is contained in:
friendica 2012-01-11 14:03:27 -08:00
parent dcc22ab5c5
commit c5f41d8b6c

View file

@ -19,6 +19,11 @@ function diaspora2bb($s) {
$s = Markdown($s); $s = Markdown($s);
$s = html2bbcode($s); $s = html2bbcode($s);
// $s = str_replace('*','*',$s); // $s = str_replace('*','*',$s);
// we seem to get a lot of text smushed together with links from Diaspora.
// if it's a url that we haven't already parsed into a bbcode structure, put a space before it.
$s = preg_replace("/([^=])(https?:\/\/)/ism",'$1 $2',$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]$2[/youtube]',$s);
$s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/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); $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]',$s);