X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/55b83cb7bd1cd7c60bb45dc22c3745dd80a63fed..f7fa6966195a3a4cc392aea56b307c939d28ffc7:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a89e827c1..9d7d4b0fd 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -195,7 +195,10 @@ sub preprocess_inline (@) {
 		@list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
 	}
 	elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
-		require Sort::Naturally;
+		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') {
@@ -278,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="";