X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2f3a279f68dcf8c1566d82419fc7257e162ee345..f5295189485a0ade5bd85d42d25b63bc7f7499c8:/IkiWiki/Plugin/attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index cb762e453..f49fe63f7 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -34,7 +34,8 @@ sub formbuilder_setup (@) { #{{{
 		# Start with the attachments interface toggled invisible,
 		# but if it was used, keep it open.
 		if ($form->submitted ne "Upload Attachment" &&
-		    ! length $q->param("attachment_select")) {
+		    (! defined $q->param("attachment_select") ||
+		    ! length $q->param("attachment_select"))) {
 			$form->tmpl_param("attachments-class" => "toggleable");
 		}
 		else {
@@ -87,6 +88,10 @@ sub formbuilder (@) { #{{{
 		# of the temp file that CGI writes the upload to.
 		my $tempfile=$q->tmpFileName($filename);
 		
+		if (! defined $tempfile || ! length $tempfile) {
+			error("failed to determine tempfile name");
+		}
+
 		$filename=IkiWiki::titlepage(
 			IkiWiki::possibly_foolish_untaint(
 				attachment_location($form->field('page')).
@@ -132,7 +137,14 @@ sub formbuilder (@) { #{{{
 		else {
 			my $fh=$q->upload('attachment');
 			if (! defined $fh || ! ref $fh) {
-				error("failed to get filehandle");
+				# needed by old CGI versions
+				$fh=$q->param('attachment');
+				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: $!");
+				}
 			}
 			binmode($fh);
 			writefile($filename, $config{srcdir}, undef, 1, sub {