bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Replace profile tab GET parameter by route

Browse source
This commit is contained in:
Hypolite Petovan 2020-01-27 19:21:18 -05:00
commit a607656607
9 changed files with 10 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Nav.php
View file

@ -155,7 +155,7 @@ class Nav
if (local_user()) {
// user menu
$nav['usermenu'][] = ['profile/' . $a->user['nickname'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
$nav['usermenu'][] = ['profile/' . $a->user['nickname'] . '?tab=profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
$nav['usermenu'][] = ['profile/' . $a->user['nickname'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
$nav['usermenu'][] = ['photos/' . $a->user['nickname'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
$nav['usermenu'][] = ['videos/' . $a->user['nickname'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')];
$nav['usermenu'][] = ['events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];

4
src/Model/Contact.php
View file

@ -1230,9 +1230,9 @@ class Contact
}
if ($sparkle) {
$status_link = $profile_link . '?tab=status';
$status_link = $profile_link . '/status';
$photos_link = str_replace('/profile/', '/photos/', $profile_link);
$profile_link = $profile_link . '?tab=profile';
$profile_link = $profile_link . '/profile';
}
if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {

2
src/Module/Contact.php
View file

@ -270,7 +270,7 @@ class Contact extends BaseModule
if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
DI::baseUrl()->redirect('profile/' . $contact['nick']);
} else {
DI::baseUrl()->redirect('profile/' . $contact['nick'] . '?tab=profile');
DI::baseUrl()->redirect('profile/' . $contact['nick'] . '/profile');
}
}