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

Fixes: 

- more "bool expected but null returned" errors
This commit is contained in:
Roland Häder 2022-06-27 13:49:26 +02:00
parent 7c049abfda
commit 8e19998191
No known key found for this signature in database
GPG Key ID: C82EDE5DDFA0BA77
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Contact.php
View File

@ -1180,7 +1180,7 @@ class Contact
$contact = self::getByURL($url, false, ['id', 'network', 'uri-id'], $uid); $contact = self::getByURL($url, false, ['id', 'network', 'uri-id'], $uid);
if (!empty($contact)) { if (!empty($contact)) {
$contact_id = $contact["id"]; $contact_id = $contact['id'];
if (empty($update) && (!empty($contact['uri-id']) || is_bool($update))) { if (empty($update) && (!empty($contact['uri-id']) || is_bool($update))) {
Logger::debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]); Logger::debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
@ -1197,10 +1197,10 @@ class Contact
$data = []; $data = [];
if (empty($default['network']) || $update) { if (empty($default['network']) || $update) {
$data = Probe::uri($url, "", $uid); $data = Probe::uri($url, '', $uid);
// Take the default values when probing failed // Take the default values when probing failed
if (!empty($default) && !in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) { if (!empty($default) && !in_array($data['network'], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
$data = array_merge($data, $default); $data = array_merge($data, $default);
} }
} elseif (!empty($default['network'])) { } elseif (!empty($default['network'])) {

6
src/Model/Contact/User.php
View File

@ -246,7 +246,7 @@ class User
if (!empty($cdata['public'])) { if (!empty($cdata['public'])) {
$public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]); $public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]);
if (DBA::isResult($public_contact)) { if (DBA::isResult($public_contact)) {
$public_ignored = $public_contact['ignored']; $public_ignored = (bool) $public_contact['ignored'];
} }
} }
@ -255,7 +255,7 @@ class User
if (!empty($cdata['user'])) { if (!empty($cdata['user'])) {
$user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]); $user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]);
if (DBA::isResult($user_contact)) { if (DBA::isResult($user_contact)) {
$user_ignored = $user_contact['readonly']; $user_ignored = (bool) $user_contact['readonly'];
} }
} }
@ -306,7 +306,7 @@ class User
if (!empty($cdata['public'])) { if (!empty($cdata['public'])) {
$public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]); $public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]);
if (DBA::isResult($public_contact)) { if (DBA::isResult($public_contact)) {
$collapsed = $public_contact['collapsed']; $collapsed = (bool) $public_contact['collapsed'];
} }
} }