From a13156c0f31bebd11569edcf587c678a89cd4175 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Jan 2012 18:52:49 -0800 Subject: bypass D* markdown bug for now --- include/bb2diaspora.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 38f5c6735..e819976a7 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -94,8 +94,12 @@ 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); + // the following was added on 10-January-2012 due to an inability of Diaspora's + // new javascript markdown processor to handle links with images as the link "text" + // It is not optimal and may be removed if this ability is restored in the future + + $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); -- cgit v1.2.3