bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6129 from friendica/5891-follow-up

Browse source 
Convert remaining instances of "contacts" in mod/(un)follow
This commit is contained in:
Michael Vogel 2018-11-13 23:29:01 +01:00 committed by GitHub
parent e6557ca9c5 d697dbd794
commit cf4a560c12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/follow.php
View file

@ -22,7 +22,7 @@ function follow_post(App $a)
} }
if (isset($_REQUEST['cancel'])) { if (isset($_REQUEST['cancel'])) {
$a->internalRedirect('contacts'); $a->internalRedirect('contact');
} }
$uid = local_user(); $uid = local_user();
@ -52,7 +52,7 @@ function follow_post(App $a)
function follow_content(App $a) function follow_content(App $a)
{ {
$return_path = 'contacts'; $return_path = 'contact';
if (!local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));

20
mod/unfollow.php
View file

@ -16,7 +16,7 @@ use Friendica\Util\Strings;
function unfollow_post(App $a) function unfollow_post(App $a)
{ {
$return_path = 'contacts'; $base_return_path = 'contact';
if (!local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
@ -34,17 +34,17 @@ function unfollow_post(App $a)
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
notice(L10n::t("You aren't following this contact.")); notice(L10n::t("You aren't following this contact."));
$a->internalRedirect($return_path); $a->internalRedirect($base_return_path);
// NOTREACHED // NOTREACHED
} }
if (!empty($_REQUEST['cancel'])) { if (!empty($_REQUEST['cancel'])) {
$a->internalRedirect($return_path . '/' . $contact['id']); $a->internalRedirect($base_return_path . '/' . $contact['id']);
} }
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
notice(L10n::t('Unfollowing is currently not supported by your network.')); notice(L10n::t('Unfollowing is currently not supported by your network.'));
$a->internalRedirect($return_path . '/' . $contact['id']); $a->internalRedirect($base_return_path . '/' . $contact['id']);
// NOTREACHED // NOTREACHED
} }
@ -58,10 +58,10 @@ function unfollow_post(App $a)
// Sharing-only contacts get deleted as there no relationship any more // Sharing-only contacts get deleted as there no relationship any more
if ($dissolve) { if ($dissolve) {
Contact::remove($contact['id']); Contact::remove($contact['id']);
$return_path = 'contacts'; $return_path = $base_return_path;
} else { } else {
DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]); DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
$return_path = 'contact/' . $contact['id']; $return_path = $base_return_path . '/' . $contact['id'];
} }
info(L10n::t('Contact unfollowed')); info(L10n::t('Contact unfollowed'));
@ -71,7 +71,7 @@ function unfollow_post(App $a)
function unfollow_content(App $a) function unfollow_content(App $a)
{ {
$return_path = 'contacts'; $base_return_path = 'contact';
if (!local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
@ -90,13 +90,13 @@ function unfollow_content(App $a)
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
notice(L10n::t("You aren't following this contact.")); notice(L10n::t("You aren't following this contact."));
$a->internalRedirect($return_path); $a->internalRedirect($base_return_path);
// NOTREACHED // NOTREACHED
} }
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
notice(L10n::t('Unfollowing is currently not supported by your network.')); notice(L10n::t('Unfollowing is currently not supported by your network.'));
$a->internalRedirect('contact/' . $contact['id']); $a->internalRedirect($base_return_path . '/' . $contact['id']);
// NOTREACHED // NOTREACHED
} }
@ -107,7 +107,7 @@ function unfollow_content(App $a)
if (!DBA::isResult($self)) { if (!DBA::isResult($self)) {
notice(L10n::t('Permission denied.')); notice(L10n::t('Permission denied.'));
$a->internalRedirect($return_path); $a->internalRedirect($base_return_path);
// NOTREACHED // NOTREACHED
} }