Felipe Schenone has submitted this change and it was merged.
Change subject: Doin't hard code the upload size
......................................................................
Doin't hard code the upload size
This allows users to customise the upload size, since some users may have
a higher limit then the one we set as default.
Default is 100mb
Change-Id: I6b0bc3c64e0fd79dbf4c41e30ab4d5986428d35f
---
M MsUpload.body.php
M MsUpload.js
M extension.json
3 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Felipe Schenone: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MsUpload.body.php b/MsUpload.body.php
index 9473cd2..d67da66 100644
--- a/MsUpload.body.php
+++ b/MsUpload.body.php
@@ -5,7 +5,7 @@
static function start() {
global $wgOut, $wgScriptPath, $wgMSU_useMsLinks,
$wgMSU_showAutoCat, $wgMSU_checkAutoCat,
$wgMSU_confirmReplace, $wgMSU_useDragDrop,
$wgMSU_imgParams, $wgFileExtensions,
- $wgMSU_flash_swf_url, $wgMSU_silverlight_xap_url;
+ $wgMSU_uploadsize, $wgMSU_flash_swf_url,
$wgMSU_silverlight_xap_url;
$wgMSU_flash_swf_url = __DIR__ . '/plupload/Moxie.swf';
$wgMSU_silverlight_xap_url = __DIR__ . '/plupload/Moxie.xap';
@@ -28,6 +28,7 @@
'useMsLinks' => $wgMSU_useMsLinks,
'confirmReplace' => $wgMSU_confirmReplace,
'imgParams' => $wgMSU_imgParams,
+ 'uploadsize' => $wgMSU_uploadsize,
);
$wgOut->addJsConfigVars( 'msuVars', $msuVars );
diff --git a/MsUpload.js b/MsUpload.js
index 3855d47..c0aca22 100755
--- a/MsUpload.js
+++ b/MsUpload.js
@@ -267,7 +267,7 @@
runtimes: 'html5,flash,silverlight,html4',
browse_button: 'msupload-select',
container: 'msupload-container',
- max_file_size: '100mb',
+ max_file_size: msuVars.uploadsize,
drop_element: 'msupload-dropzone',
url: msuVars.scriptPath + '/api.php',
flash_swf_url: msuVars.flash_swf_url,
diff --git a/extension.json b/extension.json
index 3c56e68..5c9fe63 100644
--- a/extension.json
+++ b/extension.json
@@ -63,7 +63,8 @@
"MSU_checkAutoCat": true,
"MSU_useMsLinks": false,
"MSU_confirmReplace": true,
- "MSU_imgParams": "400px"
+ "MSU_imgParams": "400px",
+ "MSU_uploadsize": "100mb"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/305854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b0bc3c64e0fd79dbf4c41e30ab4d5986428d35f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MsUpload
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Felipe Schenone <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
