Issue 9229: Show unfollow with known contacts

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 6e8778f1794a2cb4f035fd5f34dbf2b343dd4c68..659380fbef3ba7bf3a08197bc923ff038fcdf2de 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -436,17 +436,6 @@ class Contact extends BaseModule
                        if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
                                // Check if we should do HTML-based delete confirmation
                                if (!empty($_REQUEST['confirm'])) {
-                                       // <form> can't take arguments in its 'action' parameter
-                                       // so add any arguments as hidden inputs
-                                       $query = explode_querystring(DI::args()->getQueryString());
-                                       $inputs = [];
-                                       foreach ($query['args'] as $arg) {
-                                               if (strpos($arg, 'confirm=') === false) {
-                                                       $arg_parts = explode('=', $arg);
-                                                       $inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
-                                               }
-                                       }
-
                                        DI::page()['aside'] = '';
 
                                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
@@ -454,9 +443,8 @@ class Contact extends BaseModule
                                                '$contact' => self::getContactTemplateVars($orig_record),
                                                '$method' => 'get',
                                                '$message' => DI::l10n()->t('Do you really want to delete this contact?'),
-                                               '$extra_inputs' => $inputs,
                                                '$confirm' => DI::l10n()->t('Yes'),
-                                               '$confirm_url' => $query['base'],
+                                               '$confirm_url' => DI::args()->getCommand(),
                                                '$confirm_name' => 'confirmed',
                                                '$cancel' => DI::l10n()->t('Cancel'),
                                        ]);
@@ -964,7 +952,7 @@ class Contact extends BaseModule
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
 
-                       $profiledata = Model\Contact::getByURL($contact['url'], false);
+                       $profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());
 
                        Model\Profile::load($a, '', $profiledata, true);
 
@@ -987,7 +975,7 @@ class Contact extends BaseModule
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
 
-                       $profiledata = Model\Contact::getByURL($contact['url'], false);
+                       $profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());
 
                        if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
                                $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);