Skip to content

Graceful handling of undersized avatars #6621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtdesign merged 1 commit into from
Mar 4, 2026
+8 −5
Merged

Graceful handling of undersized avatars #6621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ public function execute()

$width = $avatar->width;
$height = $avatar->height;
if ($width != $height) {
if ($width !== $height && $width >= UserAvatarFileProcessor::AVATAR_SIZE && $height >= UserAvatarFileProcessor::AVATAR_SIZE) {
// make avatar quadratic
// minimum size is 128x128, maximum size is 256x256
$width = $height = \min(
Expand All @@ -293,10 +293,13 @@ public function execute()
$thumbnail = null;
}

if (
$width != UserAvatarFileProcessor::AVATAR_SIZE
&& $width != UserAvatarFileProcessor::AVATAR_SIZE_2X
) {
if ((
$width !== UserAvatarFileProcessor::AVATAR_SIZE
&& $width !== UserAvatarFileProcessor::AVATAR_SIZE_2X
) || (
$height !== UserAvatarFileProcessor::AVATAR_SIZE
&& $height !== UserAvatarFileProcessor::AVATAR_SIZE_2X
)) {
// resize avatar
$adapter = ImageHandler::getInstance()->getAdapter();

Expand Down