jenkins-bot has submitted this change and it was merged.
Change subject: Added support to ignore file extension
......................................................................
Added support to ignore file extension
* When $wgCheckFileExtensions is false, set
mw.UploadWizard.config.fileExtensions to null
* Ignore extension checks if mw.UploadWizard.config.fileExtensions is null
Bug: T103224
Change-Id: Ie6399be863df542e513dfe4f8d33c3a1afa67e75
---
M UploadWizard.config.php
M resources/mw.UploadWizardUpload.js
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
Bartosz Dziewoński: Looks good to me, but someone else must approve
Zhuyifei1999: Looks good to me, but someone else must approve
Steinsplitter: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index a3c66b0..25fdd57 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, $wgMemc, $wgUploadWizardConfig;
+global $wgFileExtensions, $wgServer, $wgScriptPath, $wgAPIModules,
$wgMaxUploadSize, $wgLang, $wgMemc, $wgUploadWizardConfig,
$wgCheckFileExtensions;
$userLangCode = $wgLang->getCode();
// We need to get a list of languages for the description dropdown.
@@ -83,7 +83,7 @@
'campaignCTACampaignTemplate' => 'uploadCampaign:$1',
// File extensions acceptable in this wiki
- 'fileExtensions' => $wgFileExtensions,
+ 'fileExtensions' => $wgCheckFileExtensions ? $wgFileExtensions : null,
// Flickr details
// Flickr API is SSL-only as of June 27th, 2014:
http://code.flickr.net/2014/04/30/flickr-api-going-ssl-only-on-june-27th-2014/
diff --git a/resources/mw.UploadWizardUpload.js
b/resources/mw.UploadWizardUpload.js
index 68ef5cb..731cc07 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -451,7 +451,10 @@
if ( mw.isEmpty( extension ) ) {
this.fileNameErr( 'noext', null );
} else {
- if ( $.inArray( extension.toLowerCase(),
mw.UploadWizard.config.fileExtensions ) === -1 ) {
+ if (
+ mw.UploadWizard.config.fileExtensions !== null
&&
+ $.inArray( extension.toLowerCase(),
mw.UploadWizard.config.fileExtensions ) === -1
+ ) {
this.fileNameErr( 'ext', extension );
} else {
// Split this into a separate case, if the
error above got ignored,
--
To view, visit https://gerrit.wikimedia.org/r/222085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6399be863df542e513dfe4f8d33c3a1afa67e75
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Zhuyifei1999 <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Rillke <[email protected]>
Gerrit-Reviewer: Steinsplitter <[email protected]>
Gerrit-Reviewer: Zhuyifei1999 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
