Browse Source

Merge pull request #1008 from annando/update-avatar

Rearranged order for the "updateAvatar" function
pull/1009/head
Hypolite Petovan 11 months ago
committed by GitHub
parent
commit
aa25a9d762
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      discourse/discourse.php
  2. +1
    -1
      pumpio/pumpio.php
  3. +3
    -3
      twitter/twitter.php

+ 1
- 1
discourse/discourse.php View File

@ -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;
}


+ 1
- 1
pumpio/pumpio.php View File

@ -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;


+ 3
- 3
twitter/twitter.php View File

@ -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();


Loading…
Cancel
Save