Fix bug that caused weird things to appear as page types.

The problem was introduced by the recent noextension patches.
Object autovivification caused junk to get into %htmlize,
and all keys of that showed up as page types.
master
Joey Hess 2009-03-15 17:39:14 -04:00
parent e95cee757a
commit c176dcde98
2 changed files with 5 additions and 2 deletions

View File

@ -639,8 +639,10 @@ sub pagetype ($) {
if ($file =~ /\.([^.]+)$/) {
return $1 if exists $hooks{htmlize}{$1};
}
elsif ($hooks{htmlize}{basename($file)}{noextension}) {
return basename($file);
my $base=basename($file);
if (exists $hooks{htmlize}{$base} &&
$hooks{htmlize}{$base}{noextension}) {
return $base;
}
return;
}

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ ikiwiki (3.08) UNRELEASED; urgency=low
* git: Fix utf-8 encoding of author names.
* git: Manually decode git output from utf-8, avoids
warning messages on invalidly encoded output.
* Fix bug that caused weird things to appear as page types.
-- Joey Hess <joeyh@debian.org> Mon, 09 Mar 2009 14:00:21 -0400