From cc7a1b181c4b6d43294d0e73d87e5028600f1eb9 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 25 Jul 2020 11:49:44 +0000 Subject: [PATCH] Rearranged order for the "updateAvatar" function --- discourse/discourse.php | 2 +- pumpio/pumpio.php | 2 +- twitter/twitter.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/discourse/discourse.php b/discourse/discourse.php index b3f95bbb..3ee980ce 100644 --- a/discourse/discourse.php +++ b/discourse/discourse.php @@ -203,7 +203,7 @@ function discourse_get_user($post, $hostaddr) $avatar = $contact['photo']; unset($contact['photo']); DBA::update('contact', $contact, ['id' => $contact['id']]); - Contact::updateAvatar($avatar, 0, $contact['id']); + Contact::updateAvatar($contact['id'], $avatar); $contact['photo'] = $avatar; } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 2144257d..6b61a594 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1068,7 +1068,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) } if (!empty($contact->image->url)) { - Contact::updateAvatar($contact->image->url, $uid, $contact_id); + Contact::updateAvatar($contact_id, $contact->image->url); } return $contact_id; diff --git a/twitter/twitter.php b/twitter/twitter.php index a44bb05e..375e264c 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1128,7 +1128,7 @@ function twitter_fetch_contact($uid, $data, $create_user) if (!empty($cid)) { DBA::update('contact', $fields, ['id' => $cid]); - Contact::updateAvatar($avatar, 0, $cid); + Contact::updateAvatar($cid, $avatar); } $contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]); @@ -1160,7 +1160,7 @@ function twitter_fetch_contact($uid, $data, $create_user) Group::addMember(User::getDefaultGroup($uid), $contact_id); - Contact::updateAvatar($avatar, $uid, $contact_id); + Contact::updateAvatar($contact_id, $avatar); } else { if ($contact["readonly"] || $contact["blocked"]) { Logger::log("twitter_fetch_contact: Contact '" . $contact["nick"] . "' is blocked or readonly.", Logger::DEBUG); @@ -1176,7 +1176,7 @@ function twitter_fetch_contact($uid, $data, $create_user) $update = true; } - Contact::updateAvatar($avatar, $uid, $contact['id']); + Contact::updateAvatar($contact['id'], $avatar); if ($contact['name'] != $data->name) { $fields['name-date'] = $fields['uri-date'] = DateTimeFormat::utcNow(); -- 2.39.5