package IkiWiki;
use warnings;
use strict;
+use encoding "utf8";
use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
%renderedfiles %pagesources %depends %hooks};
} #}}}
sub loadindex () { #{{{
- open (IN, "$config{wikistatedir}/index") || return;
+ open (IN, "<:utf8", "$config{wikistatedir}/index") || return;
while (<IN>) {
$_=possibly_foolish_untaint($_);
chomp;
if (! -d $config{wikistatedir}) {
mkdir($config{wikistatedir});
}
- open (OUT, ">$config{wikistatedir}/index") ||
+ open (OUT, ">:utf8", "$config{wikistatedir}/index") ||
error("cannot write to $config{wikistatedir}/index: $!");
foreach my $page (keys %oldpagemtime) {
next unless $oldpagemtime{$page};
# This untaint is safe because titlepage removes any problimatic
# characters.
- my ($page)=titlepage(possibly_foolish_untaint(lc($form->param('page'))));
+ my ($page)=Encode::decode_utf8($form->param('page'));
+ $page=titlepage(possibly_foolish_untaint(lc($page)));
if (! defined $page || ! length $page ||
$page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
error("bad page name");
# utf-8, so decode from it.
require Encode;
my $content = Encode::decode_utf8($form->field('editcontent'));
+ my $comments = Encode::decode_utf8($form->field('comments'));
$form->field(name => "editcontent",
value => $content, force => 1);
$form->field(name => "comments",
- value => Encode::decode_utf8($form->field('comments')), force => 1);
+ value => $comments, force => 1);
$form->tmpl_param("page_preview",
htmlize($config{default_pageext},
linkify($page, $page, $content)));
}
if (defined $form->field('comments') &&
length $form->field('comments')) {
- $message.=Encode::decode_utf8(": ".$form->field('comments'));
+ $message.=": ".Encode::decode_utf8($form->field('comments'));
}
if ($config{rcs}) {
my %exists;
my @files;
eval q{use File::Find};
+ require Encode;
find({
no_chdir => 1,
wanted => sub {
+ $_ = Encode::decode_utf8($_);
if (/$config{wiki_file_prune_regexp}/) {
$File::Find::prune=1;
}
find({
no_chdir => 1,
wanted => sub {
+ $_ = Encode::decode_utf8($_);
if (/$config{wiki_file_prune_regexp}/) {
$File::Find::prune=1;
}
if (! exists $oldpagemtime{$page} ||
mtime(srcfile($file)) > $oldpagemtime{$page}) {
- debug("rendering changed file $file");
+ debug("rendering $file");
render($file);
$rendered{$file}=1;
}
getting in the way of the preview.
* Centralised all calls to HTML::Template and force all the templates
to be read as utf8.
+ * Support pages with utf8 filenames. Patch by Faidon Liambotis.
- -- Joey Hess <joeyh@debian.org> Sun, 2 Jul 2006 14:55:40 -0400
+ -- Joey Hess <joeyh@debian.org> Mon, 3 Jul 2006 16:09:16 -0400
ikiwiki (1.7) unstable; urgency=low