X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact%2FFollow.php;h=f8b88c05fc7ab35686ede286500d988a34748736;hb=79235b6db1c9badd6c9602d54ad0d550e4bec2fd;hp=f3d4a386f8ba9eb8502b3a51a18ba7231847857b;hpb=82cd6ff91d144240f3f9872c2450931b47e40d8f;p=friendica.git diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php index f3d4a386f8..f8b88c05fc 100644 --- a/src/Module/Contact/Follow.php +++ b/src/Module/Contact/Follow.php @@ -88,7 +88,9 @@ class Follow extends BaseModule } $uid = $this->session->getLocalUserId(); - $url = Probe::cleanURI(trim($request['url'] ?? '')); + + // uri is used by the /authorize_interaction Mastodon route + $url = Probe::cleanURI(trim($request['uri'] ?? $request['url'] ?? '')); // Issue 6874: Allow remote following from Peertube if (strpos($url, 'acct:') === 0) { @@ -151,7 +153,7 @@ class Follow extends BaseModule } $requestUrl = $this->baseUrl . '/contact/follow'; - $tpl = Renderer::getMarkupTemplate('auto_request.tpl'); + $tpl = Renderer::getMarkupTemplate('auto_request.tpl'); $owner = User::getOwnerDataById($uid); if (empty($owner)) { @@ -170,7 +172,7 @@ class Follow extends BaseModule '$submit' => $submit, '$cancel' => $this->t('Cancel'), - '$request' => $requestUrl, + '$action' => $requestUrl, '$name' => $contact['name'], '$url' => $contact['url'], '$zrl' => Profile::zrl($contact['url']),