Merge remote-tracking branch 'origin/new/bug_3652'

[koha.git] / tools / upload-file.pl

diff --git a/tools/upload-file.pl b/tools/upload-file.pl
index d520b4d..b705f5c 100755 (executable)
--- a/tools/upload-file.pl
+++ b/tools/upload-file.pl
@@ -46,7 +46,7 @@ if ($auth_status ne "ok") {
     exit 0;
 }
 
-my $uploaded_file = C4::UploadedFile->new($sessionID);
+our $uploaded_file = C4::UploadedFile->new($sessionID);
 unless (defined $uploaded_file) {
     # FIXME - failed to create file for some reason
     send_reply('failed', '');
@@ -54,8 +54,6 @@ unless (defined $uploaded_file) {
 }
 $uploaded_file->max_size($ENV{'CONTENT_LENGTH'}); # may not be the file size, exactly
 
-my $first_chunk = 1;
-
 my $query;
 $query = new CGI \&upload_hook;
 $uploaded_file->done();
@@ -68,9 +66,8 @@ exit 0;
 sub upload_hook {
     my ($file_name, $buffer, $bytes_read, $session) = @_;
     $uploaded_file->stash(\$buffer, $bytes_read);
-    if ($first_chunk) {
+    if ( ! $uploaded_file->name && $file_name ) { # save name on first chunk
         $uploaded_file->name($file_name);
-        $first_chunk = 0;
     }
 }