From d3e12c58e2be3f9cefe3d218a128529d2fa587a3 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 21 Nov 2019 22:40:54 +0000 Subject: [PATCH] Fix some notices/warnings again --- include/api.php | 6 +++--- src/Protocol/Diaspora.php | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/api.php b/include/api.php index 8325e39b71..22fe64097b 100644 --- a/include/api.php +++ b/include/api.php @@ -959,7 +959,7 @@ function api_account_verify_credentials($type) // - Adding last status if (!$skip_status) { $item = api_get_last_status($user_info['pid'], $user_info['uid']); - if ($item) { + if (!empty($item)) { $user_info['status'] = api_format_item($item, $type); } } @@ -1318,7 +1318,7 @@ function api_status_show($type, $item_id) $status_info = []; $item = api_get_item(['id' => $item_id]); - if ($item) { + if (!empty($item)) { $status_info = api_format_item($item, $type); } @@ -1382,7 +1382,7 @@ function api_users_show($type) $user_info = api_get_user($a); $item = api_get_last_status($user_info['pid'], $user_info['uid']); - if ($item) { + if (!empty($item)) { $user_info['status'] = api_format_item($item, $type); } diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index e137afe99e..7c583dc280 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -3419,7 +3419,7 @@ class Diaspora $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]]; $item = Item::selectFirst(['contact-id'], $condition); if (DBA::isResult($item)) { - $ret= []; + $ret = []; $ret["root_handle"] = self::handleFromContact($item["contact-id"]); $ret["root_guid"] = $guid; return $ret; @@ -3445,12 +3445,12 @@ class Diaspora $profile = $matches[1]; } - $ret= []; + $ret = []; - if ($profile != "") { - if (Contact::getIdForURL($profile)) { - $author = Contact::getDetailsByURL($profile); - $ret["root_handle"] = $author['addr']; + if (!empty($profile) && ($cid = Contact::getIdForURL($profile))) { + $contact = DBA::selectFirst('contact', ['addr'], ['id' => $cid]); + if (!empty($contact['addr'])) { + $ret['root_handle'] = $contact['addr']; } } -- 2.39.5