Revert Photo::getImageDataForPhoto return-type change

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 54e015cf5272a25f1de02672ca1475c76140cf37..de1cb6cf7cdb05dd02a69c2bbc6447c59295f42b 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,12 +20,12 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Util\Strings;
 
@@ -59,7 +59,7 @@ function unfollow_content(App $a)
                local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
                Strings::normaliseLink($url), $url];
 
-       $contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
+       $contact = DBA::selectFirst('contact', ['url', 'id', 'uid', 'network', 'addr', 'name'], $condition);
 
        if (!DBA::isResult($contact)) {
                notice(DI::l10n()->t("You aren't following this contact."));
@@ -84,9 +84,6 @@ function unfollow_content(App $a)
                // NOTREACHED
        }
 
-       // Makes the connection request for friendica contacts easier
-       $_SESSION['fastlane'] = $contact['url'];
-
        if (!empty($_REQUEST['auto'])) {
                unfollow_process($contact['url']);
        }
@@ -99,7 +96,7 @@ function unfollow_content(App $a)
                '$submit'        => DI::l10n()->t('Submit Request'),
                '$cancel'        => DI::l10n()->t('Cancel'),
                '$url'           => $contact['url'],
-               '$zrl'           => Contact::magicLink($contact['url']),
+               '$zrl'           => Contact::magicLinkByContact($contact),
                '$url_label'     => DI::l10n()->t('Profile URL'),
                '$myaddr'        => $self['url'],
                '$request'       => $request,
@@ -107,8 +104,7 @@ function unfollow_content(App $a)
                '$keywords_label'=> ''
        ]);
 
-       DI::page()['aside'] = '';
-       Profile::load($a, '', Contact::getByURL($contact['url'], false));
+       DI::page()['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false));
 
        $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]);
 
@@ -158,4 +154,4 @@ function unfollow_process(string $url)
        }
 
        DI::baseUrl()->redirect($return_path);
-}
\ No newline at end of file
+}