X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/860a86707856dcffcc67f137a0ab250ab34c42a6..524de4db2639d37aa7049de4363c5d482cd34a0e:/IkiWiki/Plugin/inline.pm?ds=inline

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4507ace4d..04ad6ed23 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -151,7 +151,7 @@ my %feedlinks;
 sub preprocess_inline (@) {
 	my %params=@_;
 	
-	if (! exists $params{pages}) {
+	if (! exists $params{pages} && ! exists $params{pagenames}) {
 		error gettext("missing pages parameter");
 	}
 	my $raw=yesno($params{raw});
@@ -183,28 +183,45 @@ sub preprocess_inline (@) {
 		$params{template} = $archive ? "archivepage" : "inlinepage";
 	}
 
-	my @list=pagespec_match_list(
-		[ grep { $_ ne $params{page} } keys %pagesources ],
-		$params{pages}, location => $params{page});
+	my @list;
 
-	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"));
+	if (exists $params{pagenames}) {
+		foreach my $p (qw(sort pages)) {
+			if (exists $params{$p}) {
+				error sprintf(gettext("the %s and %s parameters cannot be used together"),
+					"pagenames", $p);
+			}
 		}
-		@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;
-	}
-	elsif (! exists $params{sort} || $params{sort} eq 'age') {
-		@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+
+		@list = map { bestlink($params{page}, $_) }
+		        split ' ', $params{pagenames};
+
+		$params{pages} = join(" or ", @list);
 	}
 	else {
-		error sprintf(gettext("unknown sort type %s"), $params{sort});
+		@list = pagespec_match_list(
+			[ grep { $_ ne $params{page} } keys %pagesources ],
+			$params{pages}, location => $params{page});
+
+		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;
+		}
+		elsif (! exists $params{sort} || $params{sort} eq 'age') {
+			@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+		}
+		else {
+			error sprintf(gettext("unknown sort type %s"), $params{sort});
+		}
 	}
 
 	if (yesno($params{reverse})) {
@@ -342,7 +359,7 @@ sub preprocess_inline (@) {
 					my $content=get_inline_content($page, $params{destpage});
 					$template->param(content => $content);
 				}
-				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+				$template->param(pageurl => urlto($page, $params{destpage}));
 				$template->param(inlinepage => $page);
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
@@ -354,7 +371,7 @@ sub preprocess_inline (@) {
 					my $file = $pagesources{$page};
 					my $type = pagetype($file);
 					if ($config{discussion}) {
-						my $discussionlink=gettext("discussion");
+						my $discussionlink=lc(gettext("Discussion"));
 						if ($page !~ /.*\/\Q$discussionlink\E$/ &&
 						    (length $config{cgiurl} ||
 						     exists $links{$page."/".$discussionlink})) {