X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4c6d359b5fbe8f746965a2646a7bea03284b23cc..cb1fe44f5d1b7154ee7d21f00fa6ecf4972815a7:/IkiWiki/Plugin/recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 37e45a05a..3f70664ac 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -4,6 +4,7 @@ package IkiWiki::Plugin::recentchanges;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use Encode;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
@@ -86,7 +87,7 @@ sub cgi ($) { #{{{
 		# page they link to is deleted, or newly created, or
 		# changes for whatever reason. So this CGI handles that
 		# dynamic linking stuff.
-		my $page=$cgi->param("page");
+		my $page=decode_utf8($cgi->param("page"));
 		if (!defined $page) {
 			error("missing page parameter");
 		}
@@ -103,12 +104,7 @@ sub cgi ($) { #{{{
 				"</p>");
 		}
 		else {
-			if (defined pagetype($link)) {
-				IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".htmlpage($link)));
-			}
-			else {
-				IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".$link));
-			}
+			IkiWiki::redirect($cgi, urlto($link, undef, 1));
 		}
 
 		exit;
@@ -118,7 +114,7 @@ sub cgi ($) { #{{{
 sub store ($$$) { #{{{
 	my $change=shift;
 
-	my $page="$config{recentchangespage}/change_".IkiWiki::titlepage($change->{rev});
+	my $page="$config{recentchangespage}/change_".titlepage($change->{rev});
 
 	# Optimisation to avoid re-writing pages. Assumes commits never
 	# change (or that any changes are not important).
@@ -135,12 +131,12 @@ sub store ($$$) { #{{{
 						do => "recentchanges_link",
 						page => $_->{page}
 					).
-					"\">".
-					IkiWiki::pagetitle($_->{page}).
+					"\" rel=\"nofollow\">".
+					pagetitle($_->{page}).
 					"</a>"
 			}
 			else {
-				$_->{link} = IkiWiki::pagetitle($_->{page});
+				$_->{link} = pagetitle($_->{page});
 			}
 			$_->{baseurl}="$config{url}/" if length $config{url};
 
@@ -179,6 +175,10 @@ sub store ($$$) { #{{{
 		commitdate => displaytime($change->{when}, "%X %x"),
 		wikiname => $config{wikiname},
 	);
+	
+	$template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+		if exists $config{url};
+	
 	IkiWiki::run_hooks(pagetemplate => sub {
 		shift->(page => $page, destpage => $page,
 			template => $template, rev => $change->{rev});