Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248359
Change subject: UploadWizard.config.php: Get more correct file size limits
......................................................................
UploadWizard.config.php: Get more correct file size limits
* For 'maxMwUploadSize', use UploadBase::getMaxUploadSize() rather
than directly $wgMaxUploadSize, which can be an array structure
instead of just a number.
* For 'maxPhpUploadSize', use the new UploadBase::getMaxPhpUploadSize(),
which handles HHVM quirks and unlimited 'post_max_size'.
Depends on Idf707253eeae1b90792a7e26d2ab66d1317e67ae in MediaWiki core.
Bug: T98933
Change-Id: I3b82039749cbcd603074a5b652c11cf4d8156db2
---
M UploadWizard.config.php
1 file changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/59/248359/1
diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index 809cfba..d06135f 100644
--- a/UploadWizard.config.php
+++ b/UploadWizard.config.php
@@ -4,7 +4,7 @@
* Do not modify this file, instead use localsettings.php and set:
* $wgUploadWizardConfig[ 'name'] = 'value';
*/
-global $wgFileExtensions, $wgServer, $wgScriptPath, $wgAPIModules,
$wgMaxUploadSize, $wgLang,
+global $wgFileExtensions, $wgServer, $wgScriptPath, $wgAPIModules, $wgLang,
$wgMemc, $wgUploadWizardConfig, $wgCheckFileExtensions;
$userLangCode = $wgLang->getCode();
@@ -556,13 +556,10 @@
// Max file size that is allowed by PHP (may be higher/lower than
MediaWiki file size limit).
// When using chunked uploading, these limits can be ignored.
- 'maxPhpUploadSize' => min(
- wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ),
- wfShorthandToInteger( ini_get( 'post_max_size' ) )
- ),
+ 'maxPhpUploadSize' => UploadBase::getMaxPhpUploadSize(),
// Max file size that is allowed by MediaWiki. This limit can never be
ignored.
- 'maxMwUploadSize' => $wgMaxUploadSize,
+ 'maxMwUploadSize' => UploadBase::getMaxUploadSize( 'file' ),
// Minimum length of custom wikitext for a license, if used.
// It is 6 because at minimum it needs four chars for opening and
closing
--
To view, visit https://gerrit.wikimedia.org/r/248359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b82039749cbcd603074a5b652c11cf4d8156db2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
