From f6f25758a83c20d4fd17aed7602d8828c59903b7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 21 May 2008 15:30:56 -0400
Subject: [PATCH] Perls older than 5.10 need to use the old method of decoding
 utf-8 in CGI values. Neither method will work for all versions of perl, so
 check version number at runtime.

---
 IkiWiki/CGI.pm   | 28 ++++++++++++++++++++++------
 debian/changelog |  3 +++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 1ec0128fe..532f9c5f6 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -77,13 +77,25 @@ sub check_canedit ($$$;$) { #{{{
 	return $canedit;
 } #}}}
 
+sub decode_cgi_utf8 ($) { #{{{
+	# decode_form_utf8 method is needed for 5.10
+	if ($] < 5.01) {
+		my $cgi = shift;
+		foreach my $f ($cgi->param) {
+			$cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
+		}
+	}
+} #}}}
+
 sub decode_form_utf8 ($) { #{{{
-	my $form = shift;
-	foreach my $f ($form->field) {
-		$form->field(name  => $f,
-		             value => decode_utf8($form->field($f)),
-	                     force => 1,
-		);
+	if ($] >= 5.01) {
+		my $form = shift;
+		foreach my $f ($form->field) {
+			$form->field(name  => $f,
+			             value => decode_utf8($form->field($f)),
+		                     force => 1,
+			);
+		}
 	}
 } #}}}
 
@@ -106,6 +118,7 @@ sub cgi_signin ($$) { #{{{
 	my $q=shift;
 	my $session=shift;
 
+	decode_cgi_utf8($q);
 	eval q{use CGI::FormBuilder};
 	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
@@ -165,6 +178,7 @@ sub cgi_prefs ($$) { #{{{
 	my $session=shift;
 
 	needsignin($q, $session);
+	decode_cgi_utf8($q);
 	
 	# The session id is stored on the form and checked to
 	# guard against CSRF.
@@ -260,6 +274,8 @@ sub cgi_editpage ($$) { #{{{
 	my $q=shift;
 	my $session=shift;
 	
+	decode_cgi_utf8($q);
+
 	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
 	my @buttons=("Save Page", "Preview", "Cancel");
 	eval q{use CGI::FormBuilder};
diff --git a/debian/changelog b/debian/changelog
index d80ede67d..c4919584d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ ikiwiki (2.47) UNRELEASED; urgency=low
     when generating recentchanges.
   * ENV can be used in the setup file to override environment variable
     settings, such as TZ or PATH.
+  * Perls older than 5.10 need to use the old method of decoding utf-8 in CGI
+    values. Neither method will work for all versions of perl, so check
+    version number at runtime.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 13 May 2008 12:30:18 -0400
 
-- 
2.45.0