From 3bdcb5247105f41a1b436cd00727148cda2f90b9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Jan 2012 17:20:03 -0800 Subject: [PATCH] markdown bug is Diaspora's. We can't fix it. --- include/bb2diaspora.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index cc188336b8..38f5c6735d 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -94,6 +94,9 @@ function bb2diaspora($Text,$preserve_nl = false) { // [img]pathtoimage[/img] +// $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism", +// '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text); + $Text = preg_replace("/\[bookmark\]([$URLSearchString]*)\[\/bookmark\]/ism", '[$1]($1)', $Text); $Text = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[$2]($1)', $Text); @@ -101,8 +104,6 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text); $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text); - $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism", - '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text); $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text);