Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 09:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed parameter order for getByURL

Browse source
This commit is contained in:
Michael 2020-07-15 17:06:48 +00:00
parent d9c6a46ffe
commit fc0312451d
22 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/AllFriends.php
View file

@ -63,7 +63,7 @@ class AllFriends extends BaseModule
}
DI::page()['aside'] = "";
Model\Profile::load($app, "", Model\Contact::getByURL($contact["url"], 0, [], false));
Model\Profile::load($app, "", Model\Contact::getByURL($contact["url"], false));
$total = Model\GContact::countAllFriends(local_user(), $cid);

4
src/Module/Contact.php
View file

@ -971,7 +971,7 @@ class Contact extends BaseModule
if (DBA::isResult($contact)) {
DI::page()['aside'] = '';
$profiledata = Model\Contact::getByURL($contact['url'], 0, [], false);
$profiledata = Model\Contact::getByURL($contact['url'], false);
Model\Profile::load($a, '', $profiledata, true);
@ -994,7 +994,7 @@ class Contact extends BaseModule
if (DBA::isResult($contact)) {
DI::page()['aside'] = '';
$profiledata = Model\Contact::getByURL($contact['url'], 0, [], false);
$profiledata = Model\Contact::getByURL($contact['url'], false);
if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
$profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);

2
src/Module/Contact/Advanced.php
View file

@ -108,7 +108,7 @@ class Advanced extends BaseModule
throw new BadRequestException(DI::l10n()->t('Contact not found.'));
}
Model\Profile::load(DI::app(), "", Model\Contact::getByURL($contact["url"], 0, [], false));
Model\Profile::load(DI::app(), "", Model\Contact::getByURL($contact["url"], false));
$warning = DI::l10n()->t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
$info = DI::l10n()->t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');

2
src/Module/Contact/Hovercard.php
View file

@ -67,7 +67,7 @@ class Hovercard extends BaseModule
if (Session::isAuthenticated()) {
$contact = Contact::getByURLForUser($contact_url, local_user(), [], false);
} else {
$contact = Contact::getByURL($contact_url, 0, [], false);
$contact = Contact::getByURL($contact_url, false);
}
if (!count($contact)) {

2
src/Module/Contact/Poke.php
View file

@ -138,7 +138,7 @@ class Poke extends BaseModule
throw new HTTPException\NotFoundException();
}
Model\Profile::load(DI::app(), '', Model\Contact::getByURL($contact["url"], 0, [], false));
Model\Profile::load(DI::app(), '', Model\Contact::getByURL($contact["url"], false));
$verbs = [];
foreach (DI::l10n()->getPokeVerbs() as $verb => $translations) {

2
src/Module/Search/Acl.php
View file

@ -350,7 +350,7 @@ class Acl extends BaseModule
continue;
}
$contact = Contact::getByURL($author, 0, ['micro', 'name', 'id', 'network', 'nick', 'addr', 'url', 'forum'], false);
$contact = Contact::getByURL($author, false, ['micro', 'name', 'id', 'network', 'nick', 'addr', 'url', 'forum']);
if (count($contact) > 0) {
$unknown_contacts[] = [

2
src/Module/Search/Index.php
View file

@ -239,7 +239,7 @@ class Index extends BaseSearch
if ($isAddr) {
$contact = Contact::selectFirst(['id'], ['addr' => $search, 'uid' => 0]);
} else {
$contact = array_merge(['id' => 0], Contact::getByURL($search, 0, ['id']));
$contact = array_merge(['id' => 0], Contact::getByURL($search, null, ['id']));
}
if (DBA::isResult($contact)) {