From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 8 Nov 2006 20:13:59 +0000 (+0000)
Subject: * Enable utf8 file IO in aggregate plugin.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/cb3f89f4292586455ecf6aeb775d907a980938ab?ds=sidebyside

* Enable utf8 file IO in aggregate plugin.
* Fix some issues with the new registration form.
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 3ba6cf7f8..f76019d0e 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -148,7 +148,6 @@ sub cgi_signin ($$) { #{{{
 	if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
 		$form->title("register");
 		$form->text("");
-		$form->field(name => "name", comment => "use FirstnameLastName");
 		$form->fields(qw(do title page subpage from name password confirm_password email));
 		$form->field(name => "confirm_password", type => "password");
 		$form->field(name => "email", type => "text");
@@ -186,7 +185,8 @@ sub cgi_signin ($$) { #{{{
 		}
 		# And make sure the entered name exists when logging
 		# in or sending email, and does not when registering.
-		if ($form->submitted eq 'Create Account') {
+		if ($form->submitted eq 'Create Account' ||
+		    $form->submitted eq 'Register') {
 			$form->field(
 				name => "name",
 				validate => sub {
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c8d21864a..8c4b1bfe9 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -9,6 +9,7 @@ use HTML::Entities;
 use HTML::Parser;
 use HTML::Tagset;
 use URI;
+use open qw{:utf8 :std};
 
 my %feeds;
 my %guids;
diff --git a/debian/changelog b/debian/changelog
index 0422c78b0..ee5d81e61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ ikiwiki (1.33) UNRELEASED; urgency=low
   * Fix issue with aggregate plugin updating expired pages.
   * Avoid syntax errors in templates used by the template plugin crashing
     ikiwiki.
+  * Enable utf8 file IO in aggregate plugin.
+  * Fix some issues with the new registration form.
 
- -- Joey Hess <joeyh@debian.org>  Sun,  5 Nov 2006 18:41:06 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed,  8 Nov 2006 15:13:40 -0500
 
 ikiwiki (1.32) unstable; urgency=low