response

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2cc17e32568037b27bec822fa926b0bfa70a586c..fe7dde14cfbec98c30d0a30c6696868486083c51 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -22,7 +22,6 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
 package IkiWiki;
 
 my %toping;

-my @processing_inline;

 
 sub yesno ($) { #{{{
        my $val=shift;
 
 sub yesno ($) { #{{{
        my $val=shift;


@@ -32,10 +31,6 @@ sub yesno ($) { #{{{
 sub preprocess_inline (@) { #{{{
        my %params=@_;
        
 sub preprocess_inline (@) { #{{{
        my %params=@_;
        

-       # Avoid nested inlines, to avoid loops etc.
-       return "" if grep { $_ eq $params{page} } @processing_inline;
-       push @processing_inline, $params{page};
-

        if (! exists $params{pages}) {
                return "";
        }
        if (! exists $params{pages}) {
                return "";
        }


@@ -45,6 +40,12 @@ sub preprocess_inline (@) { #{{{
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }

+       my $desc;
+       if (exists $params{description}) {
+               $desc = $params{description} 
+       } else {
+               $desc = $config{wikiname};
+       }

 
        my @list;
        foreach my $page (keys %pagesources) {
 
        my @list;
        foreach my $page (keys %pagesources) {


@@ -86,17 +87,21 @@ sub preprocess_inline (@) { #{{{
        
        foreach my $page (@list) {
                if (! $raw) {
        
        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)));
                        # 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 {
                        $template->param(ctime => displaytime($pagectime{$page}));
 
                        run_hooks(pagetemplate => sub {


@@ -112,8 +117,8 @@ sub preprocess_inline (@) { #{{{
                        my $type=pagetype($file);
                        if (defined $type) {
                                $ret.="\n".
                        my $type=pagetype($file);
                        if (defined $type) {
                                $ret.="\n".

-                                     preprocess($page, $params{page},

                                      linkify($page, $params{page},
                                      linkify($page, $params{page},

+                                     preprocess($page, $params{page},

                                      filter($page,
                                      readfile(srcfile($file)))));
                        }
                                      filter($page,
                                      readfile(srcfile($file)))));
                        }


@@ -125,11 +130,10 @@ sub preprocess_inline (@) { #{{{
        # only supports listing one file per page.
        if ($config{rss} && $rss) {
                writefile(rsspage($params{page}), $config{destdir},
        # only supports listing one file per page.
        if ($config{rss} && $rss) {
                writefile(rsspage($params{page}), $config{destdir},

-                       genrss($params{page}, @list));
+                       genrss($desc, $params{page}, @list));

                $toping{$params{page}}=1 unless $config{rebuild};
        }
        
                $toping{$params{page}}=1 unless $config{rebuild};
        }
        

-       pop @processing_inline;

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


@@ -141,8 +145,8 @@ sub get_inline_content ($$) { #{{{
        my $type=pagetype($file);
        if (defined $type) {
                return htmlize($type,
        my $type=pagetype($file);
        if (defined $type) {
                return htmlize($type,

-                      preprocess($page, $destpage,

                       linkify($page, $destpage,
                       linkify($page, $destpage,

+                      preprocess($page, $destpage,

                       filter($page,
                       readfile(srcfile($file))))));
        }
                       filter($page,
                       readfile(srcfile($file))))));
        }


@@ -180,7 +184,8 @@ sub rsspage ($) { #{{{
        return $page.".rss";
 } #}}}
 
        return $page.".rss";
 } #}}}
 

-sub genrss ($@) { #{{{
+sub genrss ($$@) { #{{{
+       my $desc = shift;

        my $page=shift;
        my @pages=@_;
        
        my $page=shift;
        my @pages=@_;
        


@@ -215,6 +220,7 @@ sub genrss ($@) { #{{{
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,

+               rssdesc => $desc,

        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,
        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,