From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 15 Feb 2015 13:01:35 +0000 (+0100)
Subject: Fixed memory usage calculation
X-Git-Tag: 2.1.0_RC_1~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d1d84af4deea47004664a4cca8456afbf085bc8;p=GitHub%2FWoltLab%2FWCF.git

Fixed memory usage calculation
---

diff --git a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
index 00a492eb3c..1c68e31850 100644
--- a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
+++ b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
@@ -173,7 +173,7 @@ class AttachmentAction extends AbstractDatabaseObjectAction {
 					$thumbnails[] = $attachment;
 					
 					// rotate image based on the exif data
-					$neededMemory = $attachment->width * $attachment->height * ($attachment->imageType == 'image/png' ? 4 : 3) * 2.1;
+					$neededMemory = $attachment->width * $attachment->height * ($attachment->fileType == 'image/png' ? 4 : 3) * 2.1;
 					if (FileUtil::getMemoryLimit() == -1 || FileUtil::getMemoryLimit() > (memory_get_usage() + $neededMemory)) {
 						$exifData = ExifUtil::getExifData($attachment->getLocation());
 						if (!empty($exifData)) {