Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail

This commit is contained in:
Michael 2017-05-17 19:56:38 +00:00
commit 192a5e254a
8 changed files with 125 additions and 14 deletions

View file

@ -307,7 +307,7 @@ function _contact_update_profile($contact_id) {
);
// Update the entry in the contact table
update_contact_avatar($data['photo'], local_user(), $contact_id);
update_contact_avatar($data['photo'], local_user(), $contact_id, true);
// Update the entry in the gcontact table
update_gcontact_from_probe($data["url"]);