summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/CGI.pm4
-rw-r--r--IkiWiki/Plugin/aggregate.pm1
2 files changed, 3 insertions, 2 deletions
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;