From 05c27c3af122b57f896927e5092bd25a9d8808d3 Mon Sep 17 00:00:00 2001 From: Jan Gerber Date: Tue, 3 Apr 2012 20:26:21 +0200 Subject: [PATCH] report real upload limit on Special:Upload upload limit also depends on post_max_size check post_max_size and upload_max_filesize for reported upload limit. Change-Id: I587b67fb95f73d1b00ec1b407608934e8a1f1360 --- includes/specials/SpecialUpload.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index fabe4c40c4..91631f8aed 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -830,7 +830,9 @@ class UploadForm extends HTMLForm { # that setting doesn't exist if ( !wfIsHipHop() ) { $this->mMaxUploadSize['file'] = min( $this->mMaxUploadSize['file'], - wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ) ); + wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ), + wfShorthandToInteger( ini_get( 'post_max_size' ) ) + ); } $descriptor['UploadFile'] = array( -- 2.20.1