projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Work around a strange bug in CGI::FormBuilder 3.0401 that makes
[ikiwiki.git]
/
IkiWiki
/
CGI.pm
diff --git
a/IkiWiki/CGI.pm
b/IkiWiki/CGI.pm
index f76019d0e5fabebf2ee63e4d1796174c028ee66e..59e9ce161b022cff7be26350e251b16d7f5a5da6 100644
(file)
--- a/
IkiWiki/CGI.pm
+++ b/
IkiWiki/CGI.pm
@@
-74,10
+74,13
@@
sub cgi_recentchanges ($) { #{{{
# during page builds as the return values may change, but they
# won't here.)
eval q{use Memoize};
# during page builds as the return values may change, but they
# won't here.)
eval q{use Memoize};
+ error($@) if $@;
memoize("htmllink");
eval q{use Time::Duration};
memoize("htmllink");
eval q{use Time::Duration};
+ error($@) if $@;
eval q{use CGI 'escapeHTML'};
eval q{use CGI 'escapeHTML'};
+ error($@) if $@;
my $changelog=[rcs_recentchanges(100)];
foreach my $change (@$changelog) {
my $changelog=[rcs_recentchanges(100)];
foreach my $change (@$changelog) {
@@
-114,6
+117,7
@@
sub cgi_signin ($$) { #{{{
my $session=shift;
eval q{use CGI::FormBuilder};
my $session=shift;
eval q{use CGI::FormBuilder};
+ error($@) if $@;
my $form = CGI::FormBuilder->new(
title => "signin",
fields => [qw(do title page subpage from name password)],
my $form = CGI::FormBuilder->new(
title => "signin",
fields => [qw(do title page subpage from name password)],
@@
-262,6
+266,7
@@
sub cgi_signin ($$) { #{{{
);
eval q{use Mail::Sendmail};
);
eval q{use Mail::Sendmail};
+ error($@) if $@;
sendmail(
To => userinfo_get($user_name, "email"),
From => "$config{wikiname} admin <$config{adminemail}>",
sendmail(
To => userinfo_get($user_name, "email"),
From => "$config{wikiname} admin <$config{adminemail}>",
@@
-294,6
+299,7
@@
sub cgi_prefs ($$) { #{{{
my $session=shift;
eval q{use CGI::FormBuilder};
my $session=shift;
eval q{use CGI::FormBuilder};
+ error($@) if $@;
my $form = CGI::FormBuilder->new(
title => "preferences",
fields => [qw(do name password confirm_password email
my $form = CGI::FormBuilder->new(
title => "preferences",
fields => [qw(do name password confirm_password email
@@
-388,6
+394,7
@@
sub cgi_editpage ($$) { #{{{
my @buttons=("Save Page", "Preview", "Cancel");
eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
my @buttons=("Save Page", "Preview", "Cancel");
eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
+ error($@) if $@;
my $renderer=CGI::FormBuilder::Template::HTML->new(
fields => \@fields,
template_params("editpage.tmpl"),
my $renderer=CGI::FormBuilder::Template::HTML->new(
fields => \@fields,
template_params("editpage.tmpl"),
@@
-575,6
+582,7
@@
sub cgi_editpage ($$) { #{{{
$form->title("editing ".pagetitle($page));
}
$form->title("editing ".pagetitle($page));
}
+ print "Content-Type: text/html\n\n";
print $form->render(submit => \@buttons);
}
else {
print $form->render(submit => \@buttons);
}
else {
@@
-639,8
+647,8
@@
sub cgi_editpage ($$) { #{{{
} #}}}
sub cgi () { #{{{
} #}}}
sub cgi () { #{{{
- eval q{use CGI};
- e
val q{use CGI::Session}
;
+ eval q{use CGI
; use CGI::Session
};
+ e
rror($@) if $@
;
my $q=CGI->new;
my $q=CGI->new;