Hopefully the final fix for image links in bb2diaspora
This commit is contained in:
parent
8aeb3ec2fb
commit
335c15ede5
|
@ -190,7 +190,7 @@ function diaspora_ol($s) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function bb2diaspora($Text,$preserve_nl = false) {
|
function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
|
||||||
|
|
||||||
// Re-enabling the converter again.
|
// Re-enabling the converter again.
|
||||||
// The bbcode parser now handles youtube-links (and the other stuff) correctly.
|
// The bbcode parser now handles youtube-links (and the other stuff) correctly.
|
||||||
|
@ -202,8 +202,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
|
||||||
// the following was added on 10-January-2012 due to an inability of Diaspora's
|
// 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"
|
// 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
|
// It is not optimal and may be removed if this ability is restored in the future
|
||||||
|
if ($fordiaspora)
|
||||||
$Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
|
$Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
|
||||||
"[img]$2[/img]\n[url]$1[/url]", $Text);
|
"[url]$1[/url]\n[img]$2[/img]", $Text);
|
||||||
|
|
||||||
// Convert it to HTML - don't try oembed
|
// Convert it to HTML - don't try oembed
|
||||||
$Text = bbcode($Text, $preserve_nl, false);
|
$Text = bbcode($Text, $preserve_nl, false);
|
||||||
|
|
Loading…
Reference in a new issue