urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta: Fix bug in loading of HTML::Entities that can break inline archive=yes (mostly masked by other plugins that load the module).

master
Joey Hess 2011-04-12 12:30:24 -04:00
parent 6da98ac3f7
commit d22489299a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/meta.pm
View File

@ -300,7 +300,8 @@ sub pagetemplate (@) {
$template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
}
if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
$template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
eval q{use HTML::Entities};
$template->param(title => encode_numeric($pagestate{$page}{meta}{title}));
$template->param(title_overridden => 1);
}
@ -315,7 +316,8 @@ sub pagetemplate (@) {
}
foreach my $field (qw{description}) {
$template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
eval q{use HTML::Entities};
$template->param($field => encode_numeric($pagestate{$page}{meta}{$field}))
if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
}

2
debian/changelog vendored
View File

@ -8,6 +8,8 @@ ikiwiki (3.20110329) UNRELEASED; urgency=low
* Recommend libgravatar-url-perl, which contains Libravatar::URL.
* monotone: Implement rcs_getmtime, and work around a problem with monotone
0.48 that affects rcs_getctime. (Thanks, Richard Levitte)
* meta: Fix bug in loading of HTML::Entities that can break inline
archive=yes (mostly masked by other plugins that load the module).
-- Joey Hess <joeyh@debian.org> Mon, 28 Mar 2011 13:08:23 -0400

6
doc/bugs/inline_archive_crash.mdwn 100644
View File

@ -0,0 +1,6 @@
\[[!inline Error: Undefined subroutine &HTML::Entities::encode_numeric called at /usr/share/perl5/IkiWiki/Plugin/meta.pm line 292.]]
This occurred when recentchanges was disabled and building a change
to a page that inlined other pages with archive=yes. I have
committed a fix; filing a bug since the fix won't be landing in Debian stable any
time soon. [[done]] --[[Joey]]