From 46dd453e5bfbe1d36061b0c2b6a131b0c0082d51 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 2 Feb 2015 20:26:05 +0100 Subject: [PATCH] Diaspora internal GUID links are now converted correctly. --- include/bbcode.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index c2ebf35e63..c08c6d4d95 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -664,6 +664,12 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork = return($username); } +function bb_DiasporaLinks($match) { + $a = get_app(); + + return "[url=".$a->get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]"; +} + function bb_RemovePictureLinks($match) { $text = Cache::get($match[1]); @@ -880,6 +886,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal else $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text); + // Handle Diaspora posts + $Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text); + // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text if (!$forplaintext) $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1$2', $Text);