From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 20 May 2006 07:37:47 +0000 (+0000)
Subject: Fix #6025: SpecialImport.php -> wrong message when no file was selected
X-Git-Tag: 1.31.0-rc.0~57084
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=c66585caa975c74fceae1afb96a3e388bba5a99c;p=lhc%2Fweb%2Fwiklou.git

Fix #6025: SpecialImport.php -> wrong message when no file was selected
Patch by Jimmy Collins <jimmy.collins@web.de>
---

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'] ) ) {