Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/184411

Change subject: Check $wgCheckFileExtensions on client side on Special:Upload
......................................................................

Check $wgCheckFileExtensions on client side on Special:Upload

Setting $wgCheckFileExtensions to false but having
$wgStrictFileExtensions still on true will reject unknown file
extensions on Special:Upload with javascript.

Bug: T25583
Change-Id: I260107bb5c3206044f766d308572ad27378715bb
---
M includes/specials/SpecialUpload.php
M resources/src/mediawiki.special/mediawiki.special.upload.js
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/184411/1

diff --git a/includes/specials/SpecialUpload.php 
b/includes/specials/SpecialUpload.php
index b965b54..2a5b7ad 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1146,6 +1146,7 @@
                                // the wpDestFile textbox
                                $this->mDestFile === '',
                        'wgUploadSourceIds' => $this->mSourceIds,
+                       'wgCheckFileExtensions' => $config->get( 
'CheckFileExtensions' ),
                        'wgStrictFileExtensions' => $config->get( 
'StrictFileExtensions' ),
                        'wgFileExtensions' => array_values( array_unique( 
$config->get( 'FileExtensions' ) ) ),
                        'wgCapitalizeUploads' => MWNamespace::isCapitalized( 
NS_FILE ),
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js 
b/resources/src/mediawiki.special/mediawiki.special.upload.js
index c6ee1a7..f405c7a 100644
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@ -202,6 +202,7 @@
                                // URLs are less likely to have a useful 
extension, so don't include them in the
                                // extension check.
                                if (
+                                       mw.config.get( 'wgCheckFileExtensions' 
) &&
                                        mw.config.get( 'wgStrictFileExtensions' 
) &&
                                        mw.config.get( 'wgFileExtensions' ) &&
                                        $( this ).attr( 'id' ) !== 
'wpUploadFileURL'

-- 
To view, visit https://gerrit.wikimedia.org/r/184411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I260107bb5c3206044f766d308572ad27378715bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to