clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5953 from MrPetovan/task/5891-contacts-follow-up 

Replace remaining instances of "contacts/"
This commit is contained in:
Michael Vogel 2018-10-18 16:02:02 +02:00 committed by GitHub
parent e2f005f68c 6d5b2c484d
commit 2a3d5da8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/common.php
View File

@ -48,9 +48,9 @@ function common_content(App $a)
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [ $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
'$name' => htmlentities($contact['name']), '$name' => htmlentities($contact['name']),
'$photo' => $contact['photo'], '$photo' => $contact['photo'],
'url' => 'contacts/' . $cid 'url' => 'contact/' . $cid
]); ]);
if (!x($a->page, 'aside')) { if (!x($a->page, 'aside')) {

2
mod/crepair.php
View File

@ -114,7 +114,7 @@ function crepair_content(App $a)
$warning = L10n::t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.'); $warning = L10n::t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
$info = L10n::t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.'); $info = L10n::t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
$returnaddr = "contacts/$cid"; $returnaddr = "contact/$cid";
$allow_remote_self = Config::get('system', 'allow_users_remote_self'); $allow_remote_self = Config::get('system', 'allow_users_remote_self');

2
mod/follow.php
View File

@ -39,7 +39,7 @@ function follow_post(App $a)
} }
goaway($return_url); goaway($return_url);
} elseif ($result['cid']) { } elseif ($result['cid']) {
goaway('contacts/' . $result['cid']); goaway('contact/' . $result['cid']);
} }
info(L10n::t('The contact could not be added.')); info(L10n::t('The contact could not be added.'));

4
mod/unfollow.php
View File

@ -59,7 +59,7 @@ function unfollow_post()
$return_path = 'contacts'; $return_path = 'contacts';
} else { } else {
DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]); DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
$return_path = 'contacts/' . $contact['id']; $return_path = 'contact/' . $contact['id'];
} }
info(L10n::t('Contact unfollowed')); info(L10n::t('Contact unfollowed'));
@ -94,7 +94,7 @@ function unfollow_content(App $a)
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.'));
goaway('contacts/' . $contact['id']); goaway('contact/' . $contact['id']);
// NOTREACHED // NOTREACHED
} }