Merge pull request #820 from annando/statusnet-notice

Avoid some notices in the statusnet addon
This commit is contained in:
Tobias Diekershoff 2019-03-03 07:48:39 +01:00 committed by GitHub
commit 8d87b596f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -938,7 +938,7 @@ function statusnet_address($contact)
function statusnet_fetch_contact($uid, $contact, $create_user) function statusnet_fetch_contact($uid, $contact, $create_user)
{ {
if ($contact->statusnet_profile_url == "") { if (empty($contact->statusnet_profile_url)) {
return -1; return -1;
} }
@ -1255,6 +1255,10 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
$own_contact = statusnet_fetch_own_contact($a, $uid); $own_contact = statusnet_fetch_own_contact($a, $uid);
if (empty($own_contact)) {
return;
}
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($own_contact), intval($own_contact),
intval($uid)); intval($uid));
@ -1560,6 +1564,10 @@ function statusnet_fetch_own_contact(App $a, $uid)
// Fetching user data // Fetching user data
$user = $connection->get('account/verify_credentials'); $user = $connection->get('account/verify_credentials');
if (empty($user)) {
return false;
}
PConfig::set($uid, 'statusnet', 'own_url', Strings::normaliseLink($user->statusnet_profile_url)); PConfig::set($uid, 'statusnet', 'own_url', Strings::normaliseLink($user->statusnet_profile_url));
$contact_id = statusnet_fetch_contact($uid, $user, true); $contact_id = statusnet_fetch_contact($uid, $user, true);