X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bb93fccf0690344aa77f9538a508959a6de09847..7481329bdd11d81c4b3e85a446ab1e4bfcc298c8:/IkiWiki/Plugin/recentchanges.pm?ds=inline

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 12577e9ef..758b98348 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::recentchanges;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 use HTML::Entities;
 
@@ -13,7 +13,8 @@ sub import {
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
 	hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
 	hook(type => "htmlize", id => "_change", call => \&htmlize);
-	hook(type => "cgi", id => "recentchanges", call => \&cgi);
+	# Load goto to fix up links from recentchanges
+	IkiWiki::loadplugin("goto");
 }
 
 sub getsetup () {
@@ -59,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);
 	}
@@ -79,39 +80,6 @@ sub htmlize (@) {
 	return $params{content};
 }
 
-sub cgi ($) {
-	my $cgi=shift;
-	if (defined $cgi->param('do') && $cgi->param('do') eq "recentchanges_link") {
-		# This is a link from a change page to some
-		# other page. Since the change pages are only generated
-		# once, statically, links on them won't be updated if the
-		# page they link to is deleted, or newly created, or
-		# changes for whatever reason. So this CGI handles that
-		# dynamic linking stuff.
-		my $page=decode_utf8($cgi->param("page"));
-		if (!defined $page) {
-			error("missing page parameter");
-		}
-
-		IkiWiki::loadindex();
-
-		my $link=bestlink("", $page);
-		if (! length $link) {
-			print "Content-type: text/html\n\n";
-			print IkiWiki::misctemplate(gettext(gettext("missing page")),
-				"<p>".
-				sprintf(gettext("The page %s does not exist."),
-					htmllink("", "", $page)).
-				"</p>");
-		}
-		else {
-			IkiWiki::redirect($cgi, urlto($link, undef, 1));
-		}
-
-		exit;
-	}
-}
-
 sub store ($$$) {
 	my $change=shift;
 
@@ -129,7 +97,7 @@ sub store ($$$) {
 			if (length $config{cgiurl}) {
 				$_->{link} = "<a href=\"".
 					IkiWiki::cgiurl(
-						do => "recentchanges_link",
+						do => "goto",
 						page => $_->{page}
 					).
 					"\" rel=\"nofollow\">".
@@ -146,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 => "recentchanges_link",
-			page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+			do => "goto",
+			page => IkiWiki::userpage($change->{author}),
 		);
 	}