From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 8 Jul 2008 14:42:58 +0000 (-0400)
Subject: attachment: Support old versions of CGI.pm that lack an upload method.
X-Git-Tag: 2.53~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71f10579c00a8ddc20ada1a1efd33aac25a3da7e;p=ikiwiki.git

attachment: Support old versions of CGI.pm that lack an upload method.
---

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 90e0f0f0b..f4f64b46a 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -133,7 +133,11 @@ 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) {
+					error("failed to get filehandle");
+				}
 			}
 			binmode($fh);
 			writefile($filename, $config{srcdir}, undef, 1, sub {
diff --git a/debian/changelog b/debian/changelog
index eee1a01b9..66ccc5b60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (2.53) UNRELEASED; urgency=low
   * attachment: Fix an uninitialised value warning when editing a page
     that currently has no attachments.
   * Fix a bug with links to pages whose names contained colons.
+  * attachment: Support old versions of CGI.pm that lack an upload method.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Jul 2008 01:52:48 -0400