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

Merge pull request #8250 from annando/issue-8233

Browse source 
Issue 8233: Fix remote subscriptions
This commit is contained in:
Hypolite Petovan 2020-02-06 20:00:13 -05:00 committed by GitHub
commit b53f2f2933
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/dfrn_request.php
View file

@ -455,15 +455,9 @@ function dfrn_request_post(App $a)
// Diaspora needs the uri in the format user@domain.tld // Diaspora needs the uri in the format user@domain.tld
// Diaspora will support the remote subscription in a future version // Diaspora will support the remote subscription in a future version
if ($network == Protocol::DIASPORA) { if ($network == Protocol::DIASPORA) {
$uri = $nickname . '@' . DI::baseUrl()->getHostname(); $uri = urlencode($a->profile['addr']);
if (DI::baseUrl()->getUrlPath()) {
$uri .= '/' . DI::baseUrl()->getUrlPath();
}
$uri = urlencode($uri);
} else { } else {
$uri = 'profile/' . $nickname; $uri = urlencode($a->profile['url']);
} }
$url = str_replace('{uri}', $uri, $url); $url = str_replace('{uri}', $uri, $url);