urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the attachment plugin work with CGI.pm 4.x (Closes: #786586; workaround for #786587 in libcgi-pm-perl)

master
Simon McVittie 2015-06-07 14:49:31 +01:00
parent 761d9f1605
commit 7a52c87a8c
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
IkiWiki/Plugin/attachment.pm
View File

@ -133,8 +133,10 @@ sub formbuilder (@) {
return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ; return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;
my $filename=Encode::decode_utf8(scalar $q->param('attachment')); my $filename=Encode::decode_utf8(scalar $q->param('attachment'));
my $handle=$q->upload('attachment');
if (defined $filename && length $filename) { if (defined $filename && length $filename) {
attachment_store($filename, $form, $q, $params{session}); attachment_store($filename, $handle, $form, $q, $params{session});
} }
if ($form->submitted eq "Save Page") { if ($form->submitted eq "Save Page") {
@ -190,13 +192,20 @@ sub is_held_attachment {
# Stores the attachment in a holding area, not yet in the wiki proper. # Stores the attachment in a holding area, not yet in the wiki proper.
sub attachment_store { sub attachment_store {
my $filename=shift; my $filename=shift;
my $handle=shift;
my $form=shift; my $form=shift;
my $q=shift; my $q=shift;
my $session=shift; my $session=shift;
# This is an (apparently undocumented) way to get the name my $tempfile;
# of the temp file that CGI writes the upload to. if (defined $handle) {
my $tempfile=$q->tmpFileName($filename); # This is what works in CGI.pm 4.09+: $q->tmpFileName($q->upload('attachment'))
$tempfile=$q->tmpFileName($handle);
}
if (! defined $tempfile || ! length $tempfile) {
# This is what is *documented* in CGI.pm 4.09: $q->tmpFileName($q->param('attachment'))
$tempfile=$q->tmpFileName($filename);
}
if (! defined $tempfile || ! length $tempfile) { if (! defined $tempfile || ! length $tempfile) {
# perl 5.8 needs an alternative, awful method # perl 5.8 needs an alternative, awful method
if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) { if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) {
@ -205,9 +214,9 @@ sub attachment_store {
last if defined $tempfile && length $tempfile; last if defined $tempfile && length $tempfile;
} }
} }
if (! defined $tempfile || ! length $tempfile) { }
error("CGI::tmpFileName failed to return the uploaded file name"); if (! defined $tempfile || ! length $tempfile) {
} error("CGI::tmpFileName failed to return the uploaded file name");
} }
$filename=IkiWiki::basename($filename); $filename=IkiWiki::basename($filename);

2
debian/changelog vendored
View File

@ -18,6 +18,8 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium
* Do not enable emailauth by default, to avoid surprises on httpauth-only * Do not enable emailauth by default, to avoid surprises on httpauth-only
sites. Enable it by default in openid instead, since it is essentially sites. Enable it by default in openid instead, since it is essentially
a replacement for OpenIDs. a replacement for OpenIDs.
* Make the attachment plugin work with CGI.pm 4.x (Closes: #786586;
workaround for #786587 in libcgi-pm-perl)
-- Joey Hess <id@joeyh.name> Tue, 28 Apr 2015 12:24:08 -0400 -- Joey Hess <id@joeyh.name> Tue, 28 Apr 2015 12:24:08 -0400