strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5308 from annando/diaspora-people

Browse source 
Added support for internal Diaspora links to accounts
This commit is contained in:
Hypolite Petovan 2018-06-30 19:38:20 -04:00 committed by GitHub
parent 0c553150ea 1905242a16
commit 8e55d3585f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Content/Text/BBCode.php
View file

@ -1380,6 +1380,13 @@ class BBCode extends BaseObject
}, $text }, $text
); );
$text = preg_replace_callback(
"&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi",
function ($match) {
return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]";
}, $text
);
// Server independent link to posts and comments // Server independent link to posts and comments
// See issue: https://github.com/diaspora/diaspora_federation/issues/75 // See issue: https://github.com/diaspora/diaspora_federation/issues/75
$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism"; $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";