Merge remote-tracking branch 'upstream/develop' into contact-tabs

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index e4d456d28ef372841832a6d2b3cd98276512bc1b..5ccc9c859af35382b5923dfa786cb8f2cf12a665 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -79,7 +79,6 @@ function unfollow_post(App $a)
                $return_path = $base_return_path . '/' . $contact['id'];
        }
 
-       info(DI::l10n()->t('Contact unfollowed'));
        DI::baseUrl()->redirect($return_path);
        // NOTREACHED
 }
@@ -131,22 +130,11 @@ function unfollow_content(App $a)
 
        $o = Renderer::replaceMacros($tpl, [
                '$header'        => DI::l10n()->t('Disconnect/Unfollow'),
-               '$desc'          => '',
-               '$pls_answer'    => '',
-               '$does_know_you' => '',
-               '$add_note'      => '',
                '$page_desc'     => '',
-               '$friendica'     => '',
-               '$statusnet'     => '',
-               '$diaspora'      => '',
-               '$diasnote'      => '',
                '$your_address'  => DI::l10n()->t('Your Identity Address:'),
                '$invite_desc'   => '',
-               '$emailnet'      => '',
                '$submit'        => DI::l10n()->t('Submit Request'),
                '$cancel'        => DI::l10n()->t('Cancel'),
-               '$nickname'      => '',
-               '$name'          => $contact['name'],
                '$url'           => $contact['url'],
                '$zrl'           => Contact::magicLink($contact['url']),
                '$url_label'     => DI::l10n()->t('Profile URL'),
@@ -157,7 +145,7 @@ function unfollow_content(App $a)
        ]);
 
        DI::page()['aside'] = '';
-       Profile::load($a, '', Contact::getDetailsByURL($contact['url']));
+       Profile::load($a, '', Contact::getByURL($contact['url'], false));
 
        $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]);