use strict;
use IkiWiki;
use IkiWiki::UserInfo;
+use encoding 'utf8'; # force use of utf8 for io layer
package IkiWiki;
unlockwiki();
+ # Force reading the template as utf-8, necessary if
+ # rcs_recentchanges returns true utf-8 strings.
+ open(TMPL, "<:utf8", "$config{templatedir}/recentchanges.tmpl");
+ my $template=HTML::Template->new(filehandle => *TMPL);
+ close(TMPL);
my $template=HTML::Template->new(
filename => "$config{templatedir}/recentchanges.tmpl"
);
styleurl => styleurl(),
baseurl => "$config{url}/",
);
- require Encode;
- print $q->header(-charset=>'utf-8'), Encode::decode_utf8($template->output);
+ print $q->header(-charset=>'utf-8'), $template->output;
} #}}}
sub cgi_signin ($$) { #{{{
}
elsif ($form->submitted eq "Preview") {
require IkiWiki::Render;
+ # Apparently FormBuilder doesn't not treat input as
+ # utf-8, so decode from it.
+ require Encode;
+ my $content = Encode::decode_utf8($form->field('editcontent'));
+ $form->field(name => "editcontent",
+ value => $content, force => 1);
+ $form->field(name => "comments",
+ value => Encode::decode_utf8($form->field('comments')), force => 1);
$form->tmpl_param("page_preview",
htmlize($config{default_pageext},
- linkify($page, $page, $form->field('editcontent'))));
+ linkify($page, $page, $content)));
}
else {
$form->tmpl_param("page_preview", "");
! length $form->field('editcontent')) {
my $content="";
if (exists $pagesources{lc($page)}) {
- require Encode;
- $content=Encode::decode_utf8(readfile(srcfile($pagesources{lc($page)})));
+ $content=readfile(srcfile($pagesources{lc($page)}));
$content=~s/\n/\r\n/g;
}
$form->field(name => "editcontent", value => $content,
# save page
page_locked($page, $session);
- my $content=$form->field('editcontent');
+ # Decode utf-8 since FormBuilder does not
+ require Encode;
+ my $content=Encode::decode_utf8($form->field('editcontent'));
+
$content=~s/\r\n/\n/g;
$content=~s/\r/\n/g;
writefile($file, $config{srcdir}, $content);
my $message="web commit ";
- if (length $session->param("name")) {
+ if (defined $session->param("name") &&
+ length $session->param("name")) {
$message.="by ".$session->param("name");
}
else {
}
if (defined $form->field('comments') &&
length $form->field('comments')) {
- require Encode;
$message.=Encode::decode_utf8(": ".$form->field('comments'));
}