X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ec14786c900e626ff3131b55b7c0833b6e0bf9f8..32008f8fce2d4c513693f58b28314e08ed631cfe:/IkiWiki/Plugin/inline.pm?ds=inline

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e1e57e43e..9d7d4b0fd 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use Encode;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use URI;
 
 my %knownfeeds;
@@ -194,6 +194,13 @@ sub preprocess_inline (@) {
 	if (exists $params{sort} && $params{sort} eq 'title') {
 		@list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
 	}
+	elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
+		eval q{use Sort::Naturally};
+		if ($@) {
+			error(gettext("Sort::Naturally needed for title_natural sort"));
+		}
+		@list=sort { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) } @list;
+	}
 	elsif (exists $params{sort} && $params{sort} eq 'mtime') {
 		@list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;
 	}
@@ -274,8 +281,8 @@ sub preprocess_inline (@) {
 		}
 	}
 
-	my $rssurl=basename($feedbase."rss".$feednum) if $feeds && $rss;
-	my $atomurl=basename($feedbase."atom".$feednum) if $feeds && $atom;
+	my $rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $rss;
+	my $atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage}))) if $feeds && $atom;
 
 	my $ret="";
 
@@ -519,9 +526,15 @@ sub genfeed ($$$$$@) {
 			mdate_3339 => date_3339($pagemtime{$p}),
 		);
 
-		if (exists $pagestate{$p} &&
-		    exists $pagestate{$p}{meta}{guid}) {
-			$itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+		if (exists $pagestate{$p}) {
+			if (exists $pagestate{$p}{meta}{guid}) {
+				$itemtemplate->param(guid => $pagestate{$p}{meta}{guid});
+			}
+
+			if (exists $pagestate{$p}{meta}{updated}) {
+				$itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
+				$itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
+			}
 		}
 
 		if ($itemtemplate->query(name => "enclosure")) {