From c66585caa975c74fceae1afb96a3e388bba5a99c Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Sat, 20 May 2006 07:37:47 +0000 Subject: [PATCH] Fix #6025: SpecialImport.php -> wrong message when no file was selected Patch by Jimmy Collins --- RELEASE-NOTES | 2 +- includes/SpecialImport.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8eb5b0a4e1..8f775fe5f7 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -300,7 +300,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 6012) Update to Indonesian localisation (id) * (bug 6017) Update list of bookstores in German localisation files * (bug 5187) Allow programmatically bypassing username validation, for scripts - +* (bug 6025) SpecialImport: wrong message when no file selected == Compatibility == diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php index 91abcea260..57a0ec7517 100644 --- a/includes/SpecialImport.php +++ b/includes/SpecialImport.php @@ -615,7 +615,7 @@ class ImportStreamSource { function newFromUpload( $fieldname = "xmlimport" ) { $upload =& $_FILES[$fieldname]; - if( !isset( $upload ) ) { + if( !isset( $upload ) || !$upload['name'] ) { return new WikiErrorMsg( 'importnofile' ); } if( !empty( $upload['error'] ) ) { -- 2.20.1