Index: trunk/phase3/includes/SpecialImport.php |
— | — | @@ -615,7 +615,7 @@ |
616 | 616 | function newFromUpload( $fieldname = "xmlimport" ) { |
617 | 617 | $upload =& $_FILES[$fieldname]; |
618 | 618 | |
619 | | - if( !isset( $upload ) ) { |
| 619 | + if( !isset( $upload ) || !$upload['name'] ) { |
620 | 620 | return new WikiErrorMsg( 'importnofile' ); |
621 | 621 | } |
622 | 622 | if( !empty( $upload['error'] ) ) { |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -300,8 +300,8 @@ |
301 | 301 | * (bug 6012) Update to Indonesian localisation (id) |
302 | 302 | * (bug 6017) Update list of bookstores in German localisation files |
303 | 303 | * (bug 5187) Allow programmatically bypassing username validation, for scripts |
| 304 | +* (bug 6025) SpecialImport: wrong message when no file selected |
304 | 305 | |
305 | | - |
306 | 306 | == Compatibility == |
307 | 307 | |
308 | 308 | Older PHP 4.2 and 4.1 releases are no longer supported; PHP 4 users must |