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

* Fix a bug introduced last version to do with nested inlines.

master
joey 2006-08-22 17:02:01 +00:00
parent d0fb93d800
commit 467d5b5e2a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IkiWiki/Plugin/inline.pm
View File

@ -86,17 +86,21 @@ sub preprocess_inline (@) { #{{{
foreach my $page (@list) {
if (! $raw) {
# Get the content before populating the template,
# since getting the content uses the same template
# if inlines are nested.
# TODO: if $archive=1, the only reason to do this
# is to let the meta plugin get page title info; so stop
# calling this next line then once the meta plugin can
# store that accross runs (also tags plugin).
my $content=get_inline_content($page, $params{page});
# Don't use htmllink because this way the title is separate
# and can be overridden by other plugins.
my $link=htmlpage(bestlink($params{page}, $page));
$link=abs2rel($link, dirname($params{page}));
$template->param(pageurl => $link);
$template->param(title => pagetitle(basename($page)));
# TODO: if $archive=1, the only reason to do this
# is to let the meta plugin get page title info; so stop
# calling this next line then once the meta plugin can
# store that accross runs (also tags plugin).
$template->param(content => get_inline_content($page, $params{page}));
$template->param(content => $content);
$template->param(ctime => displaytime($pagectime{$page}));
run_hooks(pagetemplate => sub {

3
debian/changelog vendored
View File

@ -7,8 +7,9 @@ ikiwiki (1.22) UNRELEASED; urgency=low
new more general variable can be used to link to other things (eg, images)
from the template, as well as stylesheets.
* Clean up behavior with broken parentlinks.
* Fix a bug introduced last version to do with nested inlines.
-- Joey Hess <joeyh@debian.org> Mon, 21 Aug 2006 18:26:28 -0400
-- Joey Hess <joeyh@debian.org> Tue, 22 Aug 2006 12:53:05 -0400
ikiwiki (1.21) unstable; urgency=low