* Allow preprocessor directives to be expanded in inlined blog pages.

[ikiwiki.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fc9d5f01cc0044a0b728159fb68e0fb841d25734..427c25a96d75f8ffdd760a487ad1ae704ee80364 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -21,6 +21,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
+my $processing_inline=0;
 
 sub preprocess_inline (@) { #{{{
        my %params=@_;
@@ -35,6 +36,12 @@ sub preprocess_inline (@) { #{{{
                $params{show}=10;
        }
 
+       # Avoid nested inlines, to avoid loops etc.
+       if ($processing_inline) {
+               return "";
+       }
+       $processing_inline=1;
+
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
@@ -77,10 +84,22 @@ sub preprocess_inline (@) { #{{{
        
        foreach my $page (@list) {
                $template->param(pagelink => htmllink($params{page}, $params{page}, $page));
-               $template->param(content => get_inline_content($params{page}, $page))
+               $template->param(content => get_inline_content($page, $params{page}))
                        if $params{archive} eq "no";
                $template->param(ctime => displaytime($pagectime{$page}));
+
+               if (exists $hooks{pagetemplate}) {
+                       foreach my $id (keys %{$hooks{pagetemplate}}) {
+                               $hooks{pagetemplate}{$id}{call}->(
+                                       page => $page,
+                                       destpage => $params{page},
+                                       template => $template,
+                               );
+                       }
+               }
+
                $ret.=$template->output;
+               $template->clear_params;
        }
        
        # TODO: should really add this to renderedfiles and call
@@ -89,20 +108,22 @@ sub preprocess_inline (@) { #{{{
        if ($config{rss}) {
                writefile(rsspage($params{page}), $config{destdir},
                        genrss($params{page}, @list));
-               $toping{$params{page}}=1;
+               $toping{$params{page}}=1 unless $config{rebuild};
        }
        
+       $processing_inline=0;
+
        return $ret;
 } #}}}
 
 sub get_inline_content ($$) { #{{{
-       my $parentpage=shift;
        my $page=shift;
+       my $destpage=shift;
        
        my $file=$pagesources{$page};
        my $type=pagetype($file);
-       if ($type ne 'unknown') {
-               return htmlize($type, preprocess($page, linkify($page, $parentpage, readfile(srcfile($file))), 1));
+       if (defined $type) {
+               return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));
        }
        else {
                return "";
@@ -140,7 +161,8 @@ sub genrss ($@) { #{{{
        
        my $url="$config{url}/".htmlpage($page);
        
-       my $template=template("rsspage.tmpl", blind_cache => 1);
+       my $template=template("rsspage.tmpl", blind_cache => 1,
+               die_on_bad_params => 0);
        
        my @items;
        foreach my $p (@pages) {
@@ -148,7 +170,8 @@ sub genrss ($@) { #{{{
                        itemtitle => pagetitle(basename($p)),
                        itemurl => "$config{url}/$renderedfiles{$p}",
                        itempubdate => date_822($pagectime{$p}),
-                       itemcontent => absolute_urls(get_inline_content($page, $p), $url),
+                       itemcontent => absolute_urls(get_inline_content($p, $page), $url),
+                       page => $p, # used by category adding code in tag plugin
                } if exists $renderedfiles{$p};
        }
 
@@ -158,6 +181,14 @@ sub genrss ($@) { #{{{
                items => \@items,
        );
        
+       foreach my $id (keys %{$hooks{pagetemplate}}) {
+               $hooks{pagetemplate}{$id}{call}->(
+                       page => $page,
+                       destpage => $page,
+                       template => $template,
+               );
+       }
+       
        return $template->output;
 } #}}}