aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-11 22:49:17 -0800
committerfriendica <info@friendica.com>2012-01-11 22:49:17 -0800
commitaa1c28cf399f42b8b84f5a74bd9ab1a3ee34844c (patch)
tree5806b528af61519c21ff8770441030da6d589356 /include
parent792e957842838644716c907995ee7f3597b81fe3 (diff)
downloadvolse-hubzilla-aa1c28cf399f42b8b84f5a74bd9ab1a3ee34844c.tar.gz
volse-hubzilla-aa1c28cf399f42b8b84f5a74bd9ab1a3ee34844c.tar.bz2
volse-hubzilla-aa1c28cf399f42b8b84f5a74bd9ab1a3ee34844c.zip
fine tuning diaspora markdown to bbcode
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 8564d20e3..8f17f2e36 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -22,7 +22,7 @@ function diaspora2bb($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("/([^=\"\]])(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]$1[/youtube]',$s);