friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #9441 from annando/fatal 

Fix Fatal error
This commit is contained in:
Philipp 2020-10-20 19:33:39 +02:00 committed by GitHub
parent e5b969ccb8 097e3d6dcc
commit 74305b3dc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Factory/Notification/Introduction.php
View File

@ -115,10 +115,17 @@ class Introduction extends BaseFactory
);
while ($notification = $this->dba->fetch($stmtNotifications)) {
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
if (empty($notification['url'])) {
continue;
}
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
// We have to distinguish between these two because they use different data.
// Contact suggestions
if ($notification['fid'] ?? '') {
if (empty($notification['furl'])) {
continue;
}
$return_addr = bin2hex($this->nick . '@' .
$this->baseUrl->getHostName() .
(($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : ''));
@ -143,10 +150,6 @@ class Introduction extends BaseFactory
// Normal connection requests
} else {
if (empty($notification['url'])) {
continue;
}
// Don't show these data until you are connected. Diaspora is doing the same.
if ($notification['network'] === Protocol::DIASPORA) {
$notification['location'] = "";