X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4558457402a4ab6bc795589a2e400fa66144f76e..efd8e93c5be79b1df0b92b2b5aee91308e4343dc:/IkiWiki/Plugin/recentchanges.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index fa851e466..758b98348 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -60,15 +60,15 @@ sub refresh ($) {
 	}
 }
 
-# Enable the recentchanges link on wiki pages.
+# Enable the recentchanges link.
 sub pagetemplate (@) {
 	my %params=@_;
 	my $template=$params{template};
 	my $page=$params{page};
 
 	if (defined $config{recentchangespage} && $config{rcs} &&
-	    $page ne $config{recentchangespage} &&
-	    $template->query(name => "recentchangesurl")) {
+	    $template->query(name => "recentchangesurl") &&
+	    $page ne $config{recentchangespage}) {
 		$template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
 		$template->param(have_actions => 1);
 	}
@@ -114,17 +114,16 @@ sub store ($$$) {
 	];
 	push @{$change->{pages}}, { link => '...' } if $is_excess;
 
-	# See if the committer is an openid.
 	$change->{author}=$change->{user};
 	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
 	if (defined $oiduser) {
 		$change->{authorurl}=$change->{user};
-		$change->{user}=$oiduser;
+		$change->{user}=defined $change->{nickname} ? $change->{nickname} : $oiduser;
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
 			do => "goto",
-			page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+			page => IkiWiki::userpage($change->{author}),
 		);
 	}