jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10842 from annando/issue-10841

Browse source 
Issue 10841: Redirect always to the same page
This commit is contained in:
Hypolite Petovan 2021-10-06 15:23:32 -04:00 committed by GitHub
commit 86648fc073
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Contact.php
View file

@ -360,13 +360,13 @@ class Contact extends BaseModule
if ($cmd === 'update' && $cdata['user']) { if ($cmd === 'update' && $cdata['user']) {
self::updateContactFromPoll($cdata['user']); self::updateContactFromPoll($cdata['user']);
DI::baseUrl()->redirect('contact/' . $cdata['public']); DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED // NOTREACHED
} }
if ($cmd === 'updateprofile' && $cdata['user']) { if ($cmd === 'updateprofile' && $cdata['user']) {
self::updateContactFromProbe($cdata['user']); self::updateContactFromProbe($cdata['user']);
DI::baseUrl()->redirect('contact/' . $cdata['public']); DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED // NOTREACHED
} }
@ -380,7 +380,7 @@ class Contact extends BaseModule
$blocked = Model\Contact\User::isBlocked($contact_id, local_user()); $blocked = Model\Contact\User::isBlocked($contact_id, local_user());
info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked'))); info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')));
DI::baseUrl()->redirect('contact/' . $cdata['public']); DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED // NOTREACHED
} }
@ -394,7 +394,7 @@ class Contact extends BaseModule
$ignored = Model\Contact\User::isIgnored($cdata['public'], local_user()); $ignored = Model\Contact\User::isIgnored($cdata['public'], local_user());
info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored'))); info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')));
DI::baseUrl()->redirect('contact/' . $cdata['public']); DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED // NOTREACHED
} }
} }