releasing version 1.23

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 935b86b5858d53ab73ce258ac9021c3b3f80aad1..8ceaa95e09f0f491401248716dc365ddd73a41b5 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -22,7 +22,6 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
-my @processing_inline;
 
 sub yesno ($) { #{{{
        my $val=shift;
@@ -32,10 +31,6 @@ sub yesno ($) { #{{{
 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 "";
        }
@@ -45,6 +40,13 @@ sub preprocess_inline (@) { #{{{
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }
+       my $desc;
+       if (exists $params{description}) {
+               $desc = $params{description} 
+       } else {
+               $desc = $config{wikiname};
+       }
+       my $actions=yesno($params{actions});
 
        my @list;
        foreach my $page (keys %pagesources) {
@@ -93,7 +95,7 @@ sub preprocess_inline (@) { #{{{
                        # 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});
+                       my $content=get_inline_content($page, $params{destpage});
                        # 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));
@@ -103,6 +105,19 @@ sub preprocess_inline (@) { #{{{
                        $template->param(content => $content);
                        $template->param(ctime => displaytime($pagectime{$page}));
 
+                       if ($actions) {
+                               my $file = $pagesources{$page};
+                               my $type = pagetype($file);
+                               if ($config{discussion}) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+                               }
+                               if (length $config{cgiurl} && defined $type) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                               }
+                       }
+
                        run_hooks(pagetemplate => sub {
                                shift->(page => $page, destpage => $params{page},
                                        template => $template,);
@@ -116,8 +131,8 @@ sub preprocess_inline (@) { #{{{
                        my $type=pagetype($file);
                        if (defined $type) {
                                $ret.="\n".
-                                     preprocess($page, $params{page},
                                      linkify($page, $params{page},
+                                     preprocess($page, $params{page},
                                      filter($page,
                                      readfile(srcfile($file)))));
                        }
@@ -129,11 +144,10 @@ sub preprocess_inline (@) { #{{{
        # 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};
        }
        
-       pop @processing_inline;
        return $ret;
 } #}}}
 
@@ -144,9 +158,9 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {
-               return htmlize($type,
-                      preprocess($page, $destpage,
+               return htmlize($page, $type,
                       linkify($page, $destpage,
+                      preprocess($page, $destpage,
                       filter($page,
                       readfile(srcfile($file))))));
        }
@@ -184,11 +198,12 @@ sub rsspage ($) { #{{{
        return $page.".rss";
 } #}}}
 
-sub genrss ($@) { #{{{
+sub genrss ($$@) { #{{{
+       my $desc=shift;
        my $page=shift;
        my @pages=@_;
        
-       my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
+       my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";
@@ -219,6 +234,7 @@ sub genrss ($@) { #{{{
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,
+               rssdesc => $desc,
        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,