exit with error if Text::Typography cannot be loaded

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index b1caff96dfa4941065f5f9dd529e3df423e83b0d..3b1cab9a8d3ac75edbaa4e5d5bfb8354ab5d68e1 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -137,6 +137,7 @@ sub cgi_signin ($$) { #{{{
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "signin",
+               name => "signin",
                header => 1,
                charset => "utf-8",
                method => 'POST',
@@ -145,7 +146,7 @@ sub cgi_signin ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                header => 0,
-               template => scalar template_params("signin.tmpl"),
+               template => {type => 'div'},
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
@@ -206,6 +207,7 @@ sub cgi_prefs ($$) { #{{{
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "preferences",
+               name => "preferences",
                header => 0,
                charset => "utf-8",
                method => 'POST',
@@ -216,7 +218,7 @@ sub cgi_prefs ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
-               template => scalar template_params("prefs.tmpl"),
+               template => {type => 'div'},
                stylesheet => baseurl()."style.css",
                fieldsets => [
                        [login => gettext("Login")],
@@ -316,6 +318,7 @@ sub cgi_editpage ($$) { #{{{
                action => $config{cgiurl},
                table => 0,
                template => scalar template_params("editpage.tmpl"),
+               wikiname => $config{wikiname},
        );
        
        run_hooks(formbuilder_setup => sub {
@@ -398,7 +401,7 @@ sub cgi_editpage ($$) { #{{{
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,
-                       filter($page, $form->field('editcontent')), 0, 1))));
+                       filter($page, $page, $form->field('editcontent')), 0, 1))));
        }
        else {
                $form->tmpl_param("page_preview", "");