X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/83429adf04b7a4e2f2a01de9c276d3160173fb8b..1d696aef2c6b364b55070b15dcc7084d0b09daaf:/IkiWiki/Plugin/recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 563ab7db1..4d7023c1c 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -5,6 +5,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use Encode;
+use HTML::Entities;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
@@ -104,12 +105,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;
@@ -119,7 +115,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).
@@ -136,12 +132,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};
 
@@ -164,11 +160,13 @@ sub store ($$$) { #{{{
 		);
 	}
 
-	# escape wikilinks and preprocessor stuff in commit messages
 	if (ref $change->{message}) {
 		foreach my $field (@{$change->{message}}) {
 			if (exists $field->{line}) {
-				$field->{line} =~ s/(?<!\\)\[\[/\\\[\[/g;
+				# escape html
+				$field->{line} = encode_entities($field->{line});
+				# escape links and preprocessor stuff
+				$field->{line} = encode_entities($field->{line}, '\[\]');
 			}
 		}
 	}
@@ -180,6 +178,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});