when autogenerating a dir naem, include "feed/" in it

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 1ea347b084fbeae37d18cdb8ea42be0b223e641f..7bb71a436783fe3ca57515fab67e42e39170622a 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -21,6 +21,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
 package IkiWiki;
 
 my %toping;

+my $processing_inline=0;

 
 sub preprocess_inline (@) { #{{{
        my %params=@_;
 
 sub preprocess_inline (@) { #{{{
        my %params=@_;


@@ -35,6 +36,12 @@ sub preprocess_inline (@) { #{{{
                $params{show}=10;
        }
 
                $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};
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};


@@ -51,7 +58,7 @@ sub preprocess_inline (@) { #{{{
 
        my $ret="";
        
 
        my $ret="";
        

-       if (exists $params{rootpage}) {
+       if (exists $params{rootpage} && $config{cgiurl}) {

                # Add a blog post form, with a rss link button.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});
                # Add a blog post form, with a rss link button.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});


@@ -81,15 +88,10 @@ sub preprocess_inline (@) { #{{{
                        if $params{archive} eq "no";
                $template->param(ctime => displaytime($pagectime{$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,
-                               );
-                       }
-               }
+               run_hooks(pagetemplate => sub {
+                       shift->(page => $page, destpage => $params{page},
+                               template => $template,);
+               });

 
                $ret.=$template->output;
                $template->clear_params;
 
                $ret.=$template->output;
                $template->clear_params;


@@ -104,6 +106,8 @@ sub preprocess_inline (@) { #{{{
                $toping{$params{page}}=1 unless $config{rebuild};
        }
        
                $toping{$params{page}}=1 unless $config{rebuild};
        }
        

+       $processing_inline=0;
+

        return $ret;
 } #}}}
 
        return $ret;
 } #}}}
 


@@ -114,7 +118,7 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {

-               return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file))), 1));
+               return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));

        }
        else {
                return "";
        }
        else {
                return "";


@@ -172,13 +176,10 @@ sub genrss ($@) { #{{{
                items => \@items,
        );
        
                items => \@items,
        );
        

-       foreach my $id (keys %{$hooks{pagetemplate}}) {
-               $hooks{pagetemplate}{$id}{call}->(
-                       page => $page,
-                       destpage => $page,
-                       template => $template,
-               );
-       }
+       run_hooks(pagetemplate => sub {
+               shift->(page => $page, destpage => $page,
+                       template => $template);
+       });

        
        return $template->output;
 } #}}}
        
        return $template->output;
 } #}}}