strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/friendica/friendica into develop

Browse source
This commit is contained in:
Ralf Thees 2018-10-18 21:22:13 +02:00
parent fdac992b6b ca86a9e1d6
commit fc4d01c088
6 changed files with 8 additions and 8 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
} }

2
src/Content/Text/BBCode.php
View file

@ -906,7 +906,7 @@ class BBCode extends BaseObject
$attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], false, ProxyUtils::SIZE_THUMB); $attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], false, ProxyUtils::SIZE_THUMB);
} }
return $callback($attributes, $author_contact, $match[3], trim($match[1]) != ''); return $match[1] . $callback($attributes, $author_contact, $match[3], trim($match[1]) != '');
}, },
$text $text
); );

2
src/Protocol/ActivityPub/Transmitter.php
View file

@ -355,7 +355,7 @@ class Transmitter
foreach ($receiver_list as $receiver) { foreach ($receiver_list as $receiver) {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]); $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
if (empty($contacts[$contact['url']])) { if (DBA::isResult($contact) && empty($contacts[$contact['url']])) {
$data['cc'][] = $contact['url']; $data['cc'][] = $contact['url'];
$contacts[$contact['url']] = $contact['url']; $contacts[$contact['url']] = $contact['url'];
} }