diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-02 00:19:55 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-02 00:19:55 +0000 |
| commit | 8af8d085d676d940478e45e852f06d4eec2485f8 (patch) | |
| tree | c9384598dad5aed760e96118aee7ba941a1c6549 /IkiWiki/CGI.pm | |
| parent | f65fa0ad680fb38b560ae0a459ce6b043f9631ac (diff) | |
| download | ikiwiki-8af8d085d676d940478e45e852f06d4eec2485f8.tar ikiwiki-8af8d085d676d940478e45e852f06d4eec2485f8.tar.gz | |
* The hack used to make the pagetemplate hook have access to the editpage
template won't work with CGI::FormBuilder 3.0401, so disable it for now.
* CGI::FormBuilder 3.0401 seems to work ok now with ikiwiki, although
there might still be bugs lurking..
Diffstat (limited to 'IkiWiki/CGI.pm')
| -rw-r--r-- | IkiWiki/CGI.pm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 3e324ae1c..d00de740a 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -274,15 +274,8 @@ sub cgi_editpage ($$) { #{{{ my @fields=qw(do rcsinfo subpage from page type editcontent comments); my @buttons=("Save Page", "Preview", "Cancel"); - eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML}; + eval q{use CGI::FormBuilder}; error($@) if $@; - my $renderer=CGI::FormBuilder::Template::HTML->new( - fields => \@fields, - template_params("editpage.tmpl"), - ); - run_hooks(pagetemplate => sub { - shift->(page => "", destpage => "", template => $renderer->engine); - }); my $form = CGI::FormBuilder->new( fields => \@fields, header => 1, @@ -296,7 +289,8 @@ sub cgi_editpage ($$) { #{{{ params => $q, action => $config{cgiurl}, table => 0, - template => $renderer, + template => (-e "$config{templatedir}/editpage.tmpl" ? + {template_params("editpage.tmpl")} : ""), ); run_hooks(formbuilder_setup => sub { |