From: Marcel Werk Date: Thu, 30 Jun 2016 23:04:15 +0000 (+0200) Subject: Improved check for max upload filesize during setup X-Git-Tag: 3.0.0_Beta_1~1298 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f774c315a0500ba0cb024b359ba2ea33fd63694f;p=GitHub%2FWoltLab%2FWCF.git Improved check for max upload filesize during setup --- diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index f2a1a20067..c1fddc87c1 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -361,7 +361,7 @@ class WCFSetup extends WCF { $system['sql']['result'] = MySQLDatabase::isSupported(); // upload_max_filesize - $system['uploadMaxFilesize']['value'] = ini_get('upload_max_filesize'); + $system['uploadMaxFilesize']['value'] = min(ini_get('upload_max_filesize'), ini_get('post_max_size')); $system['uploadMaxFilesize']['result'] = (intval($system['uploadMaxFilesize']['value']) > 0); // gdlib version