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 f2a1a20067443e5269b07a233aa20cc99bb7acfc..c1fddc87c111dcac4883bce6acdd790d18adc1b5 100644 (file)
--- 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