Skip to content

Commit

Permalink
Use jquery-file-upload module from npm (instead of composer)
Browse files Browse the repository at this point in the history
* the jquery-file-upload module is now loaded via npm which does not contain the offensive php code
* this also fixes the issue of the mw /vendor directory being blocked and the module therefore not being loadable directly (e.g. in debug=true mode)

Fixes #19
Fixes issue introduced into MediaWiki 1.27.4/1.28.3/1.29.2/1.30 and up with https://phabricator.wikimedia.org/T180231
  • Loading branch information
s7eph4n committed Oct 12, 2018
1 parent ecfeba2 commit 960779f
Show file tree
Hide file tree
Showing 7 changed files with 3,165 additions and 28 deletions.
1 change: 0 additions & 1 deletion composer.json
Expand Up @@ -26,7 +26,6 @@
"require": {
"php": ">=5.4",
"mediawiki/mediawiki": ">=1.26",
"blueimp/jquery-file-upload": "~9.12",
"composer/installers": "1.*,>=1.0.1"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion extension.json
@@ -1,6 +1,6 @@
{
"name": "SimpleBatchUpload",
"version": "1.3.1",
"version": "1.3.2-alpha",
"author": [
"[http://www.mediawiki.org/wiki/User:F.trott Stephan Gambke]"
],
Expand Down

0 comments on commit 960779f

Please sign in to comment.