From 91749508b463ebbb1174ba35fead97f031d616c6 Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 1 Nov 2023 13:35:11 +0000 Subject: [PATCH 1/3] Revert "Fix file verification in upload form (#54)" This reverts commit 547ae05fbb8e097365e158ed687075b25bfc1cd6. --- includes/Specials/SpecialRequestImportDump.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/Specials/SpecialRequestImportDump.php b/includes/Specials/SpecialRequestImportDump.php index d7431b989..11231c10c 100644 --- a/includes/Specials/SpecialRequestImportDump.php +++ b/includes/Specials/SpecialRequestImportDump.php @@ -126,6 +126,7 @@ protected function getFormFields() { 'help-message' => 'importdump-help-upload-file', 'hide-if' => [ '!==', 'wpUploadSourceType', 'File' ], 'accept' => [ '.xml' ], + 'required' => true, ], 'UploadFileURL' => [ 'type' => 'url', @@ -142,6 +143,7 @@ protected function getFormFields() { 'label-message' => 'importdump-label-upload-file', 'help-message' => 'importdump-help-upload-file', 'accept' => [ '.xml' ], + 'required' => true, ], ]; } @@ -219,8 +221,9 @@ public function onSubmit( array $data ) { return User::newFatalPermissionDeniedStatus( $permission ); } - if ( $uploadBase->isEmptyFile() ) { - return Status::newFatal( 'empty-file' ); + $status = $uploadBase->fetchFile(); + if ( !$status->isOK() ) { + return $status; } $virus = UploadBase::detectVirus( $uploadBase->getTempPath() ); From 5f13b278053e5dad045eb2d5d7e2b19ec496e975 Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 1 Nov 2023 13:37:16 +0000 Subject: [PATCH 2/3] Fix uploading file With [0], a default value must not be a empty string or a null. This This looks like a bug, due to the fact that we shouldn't have to supply the default value ourselfs. [0] https://github.com/wikimedia/mediawiki/commit/2b0b187bae8a42b4dca68a446ba5050bb7de6c50 --- includes/Specials/SpecialRequestImportDump.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/Specials/SpecialRequestImportDump.php b/includes/Specials/SpecialRequestImportDump.php index 11231c10c..581136758 100644 --- a/includes/Specials/SpecialRequestImportDump.php +++ b/includes/Specials/SpecialRequestImportDump.php @@ -127,6 +127,7 @@ protected function getFormFields() { 'hide-if' => [ '!==', 'wpUploadSourceType', 'File' ], 'accept' => [ '.xml' ], 'required' => true, + 'default' => 'File', ], 'UploadFileURL' => [ 'type' => 'url', @@ -134,6 +135,7 @@ protected function getFormFields() { 'help-message' => 'importdump-help-upload-file-url', 'hide-if' => [ '!==', 'wpUploadSourceType', 'Url' ], 'required' => true, + 'default' => 'File' ], ]; } else { @@ -144,6 +146,7 @@ protected function getFormFields() { 'help-message' => 'importdump-help-upload-file', 'accept' => [ '.xml' ], 'required' => true, + 'default' => 'File', ], ]; } From 8e2d7845836ac0315817ea07943e31333c0da650 Mon Sep 17 00:00:00 2001 From: paladox Date: Wed, 1 Nov 2023 13:54:10 +0000 Subject: [PATCH 3/3] Update SpecialRequestImportDump.php --- includes/Specials/SpecialRequestImportDump.php | 1 - 1 file changed, 1 deletion(-) diff --git a/includes/Specials/SpecialRequestImportDump.php b/includes/Specials/SpecialRequestImportDump.php index 581136758..2497c1fe0 100644 --- a/includes/Specials/SpecialRequestImportDump.php +++ b/includes/Specials/SpecialRequestImportDump.php @@ -135,7 +135,6 @@ protected function getFormFields() { 'help-message' => 'importdump-help-upload-file-url', 'hide-if' => [ '!==', 'wpUploadSourceType', 'Url' ], 'required' => true, - 'default' => 'File' ], ]; } else {