From 82cd6ff91d144240f3f9872c2450931b47e40d8f Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 31 Oct 2022 20:51:13 +0100 Subject: [PATCH] Fixing the non-auto follow process ... --- src/Module/Contact/Follow.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php index e9373afa56..f3d4a386f8 100644 --- a/src/Module/Contact/Follow.php +++ b/src/Module/Contact/Follow.php @@ -69,8 +69,8 @@ class Follow extends BaseModule throw new ForbiddenException($this->t('Access denied.')); } - if (!empty($request['url'])) { - $this->baseUrl->redirect($request['url']); + if (isset($request['cancel']) || empty($request['url'])) { + $this->baseUrl->redirect('contact'); } $url = Probe::cleanURI($request['url']); @@ -150,7 +150,7 @@ class Follow extends BaseModule $this->process($contact['url']); } - $request = $this->baseUrl . '/follow'; + $requestUrl = $this->baseUrl . '/contact/follow'; $tpl = Renderer::getMarkupTemplate('auto_request.tpl'); $owner = User::getOwnerDataById($uid); @@ -170,7 +170,7 @@ class Follow extends BaseModule '$submit' => $submit, '$cancel' => $this->t('Cancel'), - '$request' => $request, + '$request' => $requestUrl, '$name' => $contact['name'], '$url' => $contact['url'], '$zrl' => Profile::zrl($contact['url']), @@ -181,10 +181,10 @@ class Follow extends BaseModule '$addnote_field' => ['dfrn-request-message', $this->t('Add a personal note:')], ]); - $this['aside'] = ''; + $this->page['aside'] = ''; if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) { - $this['aside'] = VCard::getHTML($contact); + $this->page['aside'] = VCard::getHTML($contact); $output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => $this->t('Status Messages and Posts')] -- 2.39.5