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

Merge remote-tracking branch 'upstream/2020.12-rc' into notices

This commit is contained in:
Michael 2020-12-30 07:12:59 +00:00
parent a294c19d6e d41cb3f3e6
commit 96e140a027
5 changed files with 15469 additions and 14519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Factory/Api/Mastodon/Account.php
View File

@ -67,6 +67,10 @@ class Account extends BaseFactory
$userContact = []; $userContact = [];
} }
if (empty($publicContact)) {
throw new HTTPException\NotFoundException('Contact ' . $contactId . ' not found');
}
$apcontact = APContact::getByURL($publicContact['url'], false); $apcontact = APContact::getByURL($publicContact['url'], false);
$self_contact = Contact::selectFirst(['uid'], ['nurl' => $publicContact['nurl'], 'self' => true]); $self_contact = Contact::selectFirst(['uid'], ['nurl' => $publicContact['nurl'], 'self' => true]);

12169
view/lang/de/messages.po
View File

File diff suppressed because it is too large Load Diff

2818
view/lang/de/strings.php
View File

File diff suppressed because it is too large Load Diff

12179
view/lang/hu/messages.po
View File

File diff suppressed because it is too large Load Diff

2818
view/lang/hu/strings.php
View File

File diff suppressed because it is too large Load Diff