X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=6227c0304cb8792b45e8cda332bbcd8a054d6693;hb=865006682a3952565035207898b80dfbd6d390b1;hp=d655bc2bfe65270419727d6e3fd33adca074a1af;hpb=28090bd79376f3a7c0708eeb4e36a25fd782c240;p=friendica.git diff --git a/mod/follow.php b/mod/follow.php index d655bc2bfe..6227c0304c 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -60,8 +60,7 @@ function follow_content(App $a) $uid = local_user(); - // Issue 4815: Silently removing a prefixing @ - $url = ltrim(Strings::escapeTags(trim($_REQUEST['url'] ?? '')), '@!'); + $url = Probe::cleanURI(trim($_REQUEST['url'] ?? '')); // Issue 6874: Allow remote following from Peertube if (strpos($url, 'acct:') === 0) { @@ -157,8 +156,8 @@ function follow_content(App $a) DI::page()['aside'] = ''; - if ($protocol != Protocol::PHANTOM) { - DI::page()['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false)); + if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) { + DI::page()['aside'] = Widget\VCard::getHTML($contact); $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')] @@ -175,7 +174,7 @@ function follow_process(App $a, string $url) { $return_path = 'follow?url=' . urlencode($url); - $result = Contact::createFromProbe($a->getUserId(), $url); + $result = Contact::createFromProbeForUser($a->getLoggedInUserId(), $url); if ($result['success'] == false) { // Possibly it is a remote item and not an account