From: Tim Düsterhus <timwolla@googlemail.com>
Date: Tue, 23 Dec 2014 15:58:47 +0000 (+0100)
Subject: Fix memory limit check in WCFSetup
X-Git-Tag: 2.1.0_Beta_3~96^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c21e84ea778165d60ca5a65d6fe6640cc3a28678;p=GitHub%2FWoltLab%2FWCF.git

Fix memory limit check in WCFSetup
---

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 70b772490d..abdee41913 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -409,7 +409,7 @@ class WCFSetup extends WCF {
 	}
 	
 	/**
-	 * Returns true if memory_limit is set to at least 64 MB
+	 * Returns true if memory_limit is set to at least 128 MB
 	 * 
 	 * @return	boolean
 	 */
@@ -423,8 +423,8 @@ class WCFSetup extends WCF {
 		
 		// completely numeric, PHP assumes byte
 		if (is_numeric($memoryLimit)) {
-			$memoryLimit = $memoryLimit / 1024;
-			return ($memoryLimit >= 64);
+			$memoryLimit = $memoryLimit / 1024 / 1024;
+			return ($memoryLimit >= 128);
 		}
 		
 		// PHP supports 'K', 'M' and 'G' shorthand notation
@@ -432,11 +432,11 @@ class WCFSetup extends WCF {
 			switch ($matches[2]) {
 				case 'K':
 					$memoryLimit = $matches[1] * 1024;
-					return ($memoryLimit >= 64);
+					return ($memoryLimit >= 128);
 				break;
 				
 				case 'M':
-					return ($matches[1] >= 64);
+					return ($matches[1] >= 128);
 				break;
 				
 				case 'G':