* 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 3ba6cf7f84aebbb314716aa0361f9639faa0c90f..f76019d0e5fabebf2ee63e4d1796174c028ee66e 100644 (file)
--- 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 c8d21864a4f452ea3d58227bb42f1ec67ce96867..8c4b1bfe930c6bdc133160cf9a24483f490a64d5 100644 (file)
--- 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 0422c78b00eeaf2b4eff111f926eecab1a5f69c6..ee5d81e610dd7cce21343462da469d17840a666e 100644 (file)
--- 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