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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2cc17e32568037b27bec822fa926b0bfa70a586c..935b86b5858d53ab73ce258ac9021c3b3f80aad1 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -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 {

diff --git a/debian/changelog b/debian/changelog
index aaf39d23d362be16f8665e82956af3fedbfc2547..e1fa4b859b65aae7010d6cd632003a44c4cf17c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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