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

Merge pull request #11683 from MrPetovan/bug/fatal-errors 

Fix a couple Fatal Errors
This commit is contained in:
Tobias Diekershoff 2022-06-25 11:20:33 +02:00 committed by GitHub
parent c5b46fe748 c75dbfd3d7
commit b9fe8ee38f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Contact/LocalRelationship/Factory/LocalRelationship.php
View File

@ -52,7 +52,7 @@ class LocalRelationship extends BaseFactory implements ICanCreateFromTableRow
$row['hub-verify'] ?? '',
$row['protocol'] ?? Protocol::PHANTOM,
$row['rating'] ?? null,
$row['priority'] ?? null
$row['priority'] ?? 0
);
}
}

4
src/Model/GServer.php
View File

@ -2047,10 +2047,10 @@ class GServer
* Fetch the protocol of the given server
*
* @param int $gsid Server id
* @return int
* @return ?int One of Post\DeliveryData protocol constants or null if unknown or gserver is missing
* @throws Exception
*/
public static function getProtocol(int $gsid): int
public static function getProtocol(int $gsid): ?int
{
if (empty($gsid)) {
return null;

4
src/Worker/Delivery.php
View File

@ -265,11 +265,11 @@ class Delivery
* @param boolean $public_message Is the content public?
* @param boolean $top_level Is it a thread starter?
* @param boolean $followup Is it an answer to a remote post?
* @param int $server_protocol The protocol of the server
* @param int|null $server_protocol The protocol of the server
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol)
private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol = null)
{
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
if (Diaspora::isReshare($target_item['body'] ?? '') && !empty(FContact::getByURL($contact['addr'], false))) {