Skip to content

Only load the file to the attachments if it is actually needed #6381

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
Cyperghost merged 1 commit into from
Jul 9, 2025
Merged

Only load the file to the attachments if it is actually needed #6381

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
64 changes: 40 additions & 24 deletions wcfsetup/install/files/lib/data/attachment/Attachment.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
namespace wcf\data\attachment;

use wcf\data\DatabaseObject;
use wcf\data\ILinkableObject;
use wcf\data\IThumbnailFile;
use wcf\data\file\File;
use wcf\data\file\thumbnail\FileThumbnailList;
use wcf\data\ILinkableObject;
use wcf\data\IThumbnailFile;
use wcf\data\object\type\ObjectTypeCache;
use wcf\system\request\IRouteController;
use wcf\system\request\LinkHandler;
Expand Down Expand Up @@ -390,46 +390,62 @@ public function getFile(): ?File

public function setFile(File $file): void
{
if ($this->file->fileID === $file->fileID) {
if ($this->fileID === $file->fileID) {
$this->file = $file;
}
}

#[\Override]
public function __get($name)
{
$file = $this->getFile();
if ($file === null) {
return parent::__get($name);
}

if ($name === 'downloads' || $name === 'lastDownloadTime') {
// Static files are no longer served through PHP but the web server
// instead, therefore we can no longer report any meaningful numbers.
//
// For existing files the stored value is suppressed because it is
// not going to be increased ever, possibly creating a false
// impression when the historic stored value is being reported.
if ($file->isStaticFile()) {
if ($this->getFile()?->isStaticFile()) {
return 0;
}
}

return match ($name) {
'filename' => $file->filename,
'filesize' => $file->fileSize,
'fileType' => $file->mimeType,
'isImage' => $file->isImage() ? 1 : 0,
'height' => $file->height ?: 0,
'width' => $file->width ?: 0,
'thumbnailType' => $file->getThumbnail('')?->getMimeType() ?: '',
'thumbnailWidth' => $file->getThumbnail('')?->width ?: 0,
'thumbnailHeight' => $file->getThumbnail('')?->height ?: 0,
'tinyThumbnailType' => $file->getThumbnail('tiny')?->getMimeType() ?: '',
'tinyThumbnailWidth' => $file->getThumbnail('tiny')?->width ?: 0,
'tinyThumbnailHeight' => $file->getThumbnail('tiny')?->height ?: 0,
default => parent::__get($name),
};
if (\in_array($name, [
'filename',
'filesize',
'fileType',
'isImage',
'height',
'width',
'thumbnailType',
'thumbnailWidth',
'thumbnailHeight',
'tinyThumbnailType',
'tinyThumbnailWidth',
'tinyThumbnailHeight',
])) {
$file = $this->getFile();
if ($file === null) {
return parent::__get($name);
}

return match ($name) {
'filename' => $file->filename,
'filesize' => $file->fileSize,
'fileType' => $file->mimeType,
'isImage' => $file->isImage() ? 1 : 0,
'height' => $file->height ?: 0,
'width' => $file->width ?: 0,
'thumbnailType' => $file->getThumbnail('')?->getMimeType() ?: '',
'thumbnailWidth' => $file->getThumbnail('')?->width ?: 0,
'thumbnailHeight' => $file->getThumbnail('')?->height ?: 0,
'tinyThumbnailType' => $file->getThumbnail('tiny')?->getMimeType() ?: '',
'tinyThumbnailWidth' => $file->getThumbnail('tiny')?->width ?: 0,
'tinyThumbnailHeight' => $file->getThumbnail('tiny')?->height ?: 0,
};
}

return parent::__get($name);
}

public function toHtmlElement(): ?string
Expand Down