jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9441 from annando/fatal

Browse source 
Fix Fatal error
This commit is contained in:
Philipp 2020-10-20 19:33:39 +02:00 committed by GitHub
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)) { 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. // We have to distinguish between these two because they use different data.
// Contact suggestions // Contact suggestions
if ($notification['fid'] ?? '') { if ($notification['fid'] ?? '') {
if (empty($notification['furl'])) {
continue;
}
$return_addr = bin2hex($this->nick . '@' . $return_addr = bin2hex($this->nick . '@' .
$this->baseUrl->getHostName() . $this->baseUrl->getHostName() .
(($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : '')); (($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : ''));
@ -143,10 +150,6 @@ class Introduction extends BaseFactory
// Normal connection requests // Normal connection requests
} else { } else {
if (empty($notification['url'])) {
continue;
}
// Don't show these data until you are connected. Diaspora is doing the same. // Don't show these data until you are connected. Diaspora is doing the same.
if ($notification['network'] === Protocol::DIASPORA) { if ($notification['network'] === Protocol::DIASPORA) {
$notification['location'] = ""; $notification['location'] = "";