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

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index b965b54..2a5b7ad 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1146,6 +1146,7 @@ class UploadForm extends HTMLForm {
                                // 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 (file)
--- 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'