change word

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 79e64beac72a16fd5019d23eac3614ea848afbbf..c7cafee12e2e5330e859af78b8e3f29a7f33958a 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 1.00;
 use IkiWiki::Render; # for displaytime
 use URI;
 
@@ -59,7 +59,17 @@ sub preprocess_inline (@) { #{{{
                        push @list, $page;
                }
        }
-       @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+
+       if (exists $params{sort} && $params{sort} eq 'title') {
+               @list=sort @list;
+       }
+       elsif (! exists $params{sort} || $params{sort} eq 'age') {
+               @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+       }
+       else {
+               return "unknown sort type $params{sort}";
+       }
+
        if ($params{show} && @list > $params{show}) {
                @list=@list[0..$params{show} - 1];
        }
@@ -144,10 +154,8 @@ sub preprocess_inline (@) { #{{{
                }
        }
        
-       # TODO: should really add this to renderedfiles and call
-       # check_overwrite, but currently renderedfiles
-       # only supports listing one file per page.
        if ($config{rss} && $rss) {
+               will_render($params{page}, rsspage($params{page}));
                writefile(rsspage($params{page}), $config{destdir},
                        genrss($desc, $params{page}, @list));
                $toping{$params{page}}=1 unless $config{rebuild};
@@ -223,9 +231,7 @@ sub genrss ($$@) { #{{{
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";
        foreach my $p (@pages) {
-               next unless exists $renderedfiles{$p};
-
-               my $u=URI->new(encode_utf8("$config{url}/$renderedfiles{$p}"));
+               my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p)));
 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),