Merge remote branch 'upstream/master' into prv/po

Conflicts:
	IkiWiki/Plugin/po.pm

1 files changed, 10 insertions, 2 deletions

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index e678a057d..432613ddf 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -16,12 +16,21 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
 sub parentlinks ($) {
 	my $page=shift;
 
+	if (! length $page) {
+		# dynamic page
+		return {
+			url => $config{url},
+			page => $config{wikiname},
+		};
+	}
+
 	my @ret;
 	my $path="";
 	my $title=$config{wikiname};
@@ -52,12 +61,11 @@ sub parentlinks ($) {
 
 sub pagetemplate (@) {
 	my %params=@_;
-        my $page=$params{page};
         my $template=$params{template};
 
 	if ($template->query(name => "parentlinks") ||
  	   $template->query(name => "has_parentlinks")) {
-		my @links=parentlinks($page);
+		my @links=parentlinks($params{page});
 		$template->param(parentlinks => \@links);
 		$template->param(has_parentlinks => (@links > 0));
 	}