From b8eca098f9af199cfc6464c22569a31eae2bdf99 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 18 Feb 2015 18:27:44 +0100
Subject: [PATCH] Add UserAvatar::MIN_AVATAR_SIZE

---
 .../install/files/lib/data/user/avatar/UserAvatar.class.php | 6 ++++++
 .../upload/AvatarUploadFileValidationStrategy.class.php     | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
index f6fc54dc57..7feddf135a 100644
--- a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
@@ -37,6 +37,12 @@ class UserAvatar extends DatabaseObject implements IUserAvatar {
 	 */
 	public static $maxThumbnailSize = 128;
 	
+	/**
+	 * minimum height and width of an uploaded avatar
+	 * @var	integer
+	 */
+	const MIN_AVATAR_SIZE = 96;
+	
 	/**
 	 * Returns the physical location of this avatar.
 	 * 
diff --git a/wcfsetup/install/files/lib/system/upload/AvatarUploadFileValidationStrategy.class.php b/wcfsetup/install/files/lib/system/upload/AvatarUploadFileValidationStrategy.class.php
index 2afb9df4d4..b551ea441a 100644
--- a/wcfsetup/install/files/lib/system/upload/AvatarUploadFileValidationStrategy.class.php
+++ b/wcfsetup/install/files/lib/system/upload/AvatarUploadFileValidationStrategy.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\upload;
+use wcf\data\user\avatar\UserAvatar;
 use wcf\system\exception\SystemException;
 
 /**
@@ -19,10 +20,10 @@ class AvatarUploadFileValidationStrategy extends DefaultUploadFileValidationStra
 	public function validate(UploadFile $uploadFile) {
 		if (!parent::validate($uploadFile)) return false;
 		
-		// get image size
+		// check image size
 		try {
 			$imageData = getimagesize($uploadFile->getLocation());
-			if ($imageData[0] < 96 || $imageData[1] < 96) {
+			if ($imageData[0] < UserAvatar::MIN_AVATAR_SIZE || $imageData[1] < UserAvatar::MIN_AVATAR_SIZE) {
 				$uploadFile->setValidationErrorType('tooSmall');
 				return false;
 			}
-- 
2.20.1