explicitly set form type to multipart

[git.ikiwiki.info.git] / IkiWiki / Plugin / attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ed1cd61fe567c3d5cf845e5c647850de8556aa26..84bf643905f75dccf9122dc4a91bbfc201cc7079 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -21,6 +21,8 @@ sub formbuilder_setup (@) { #{{{
        my $q=$params{cgi};
 
        if (defined $form->field("do") && $form->field("do") eq "edit") {
+               # Add attachment field, set type to multipart.
+               $form->enctype(&CGI::MULTIPART);
                $form->field(name => 'attachment', type => 'file');
                # These buttons are not put in the usual place, so
                # are not added to the normal formbuilder button list.
@@ -88,8 +90,8 @@ sub formbuilder (@) { #{{{
                # of the temp file that CGI writes the upload to.
                my $tempfile=$q->tmpFileName($filename);
                
-               if (! defined $tempfile) {
-                       error("failed to determine temp filename");
+               if (! defined $tempfile || ! length $tempfile) {
+                       error("failed to determine tempfile name");
                }
 
                $filename=IkiWiki::titlepage(
@@ -142,6 +144,7 @@ sub formbuilder (@) { #{{{
                                if (! defined $fh || ! ref $fh) {
                                        # even that doesn't always work,
                                        # fall back to opening the tempfile
+                                       $fh=undef;
                                        open($fh, "<", $tempfile) || error("failed to open $tempfile: $!");
                                }
                        }