friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Hopefully the final fix for image links in bb2diaspora

This commit is contained in:
Michael Vogel 2012-07-15 13:40:01 +02:00
parent 8aeb3ec2fb
commit 335c15ede5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/bb2diaspora.php
View File

@ -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
$Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism", if ($fordiaspora)
"[img]$2[/img]\n[url]$1[/url]", $Text); $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
"[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);