tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10910 from annando/notice

Browse source 
Fix: Use correct condition to update the avatar
This commit is contained in:
Philipp 2021-10-21 23:24:02 +02:00 committed by GitHub
parent 09a809aee5 17aa00bff8
commit b6faa0878a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Settings/Profile/Photo/Crop.php
View file

@ -92,6 +92,8 @@ class Crop extends BaseSettings
$Image->scaleDown(300); $Image->scaleDown(300);
} }
$condition = ['resource-id' => $resource_id, 'uid' => local_user(), 'contact-id' => 0];
$r = Photo::store( $r = Photo::store(
$Image, $Image,
local_user(), local_user(),
@ -105,7 +107,7 @@ class Crop extends BaseSettings
if ($r === false) { if ($r === false) {
notice(DI::l10n()->t('Image size reduction [%s] failed.', '300')); notice(DI::l10n()->t('Image size reduction [%s] failed.', '300'));
} else { } else {
Photo::update(['profile' => true], ['id' => $r['id']]); Photo::update(['profile' => true], array_merge($condition, ['scale' => 4]));
} }
$Image->scaleDown(80); $Image->scaleDown(80);
@ -123,7 +125,7 @@ class Crop extends BaseSettings
if ($r === false) { if ($r === false) {
notice(DI::l10n()->t('Image size reduction [%s] failed.', '80')); notice(DI::l10n()->t('Image size reduction [%s] failed.', '80'));
} else { } else {
Photo::update(['profile' => true], ['id' => $r['id']]); Photo::update(['profile' => true], array_merge($condition, ['scale' => 5]));
} }
$Image->scaleDown(48); $Image->scaleDown(48);
@ -141,7 +143,7 @@ class Crop extends BaseSettings
if ($r === false) { if ($r === false) {
notice(DI::l10n()->t('Image size reduction [%s] failed.', '48')); notice(DI::l10n()->t('Image size reduction [%s] failed.', '48'));
} else { } else {
Photo::update(['profile' => true], ['id' => $r['id']]); Photo::update(['profile' => true], array_merge($condition, ['scale' => 6]));
} }
Contact::updateSelfFromUserID(local_user(), true); Contact::updateSelfFromUserID(local_user(), true);