X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/84c905ec2011ec846d3d8b27f21f5ffd53c73840..c5513548c9d43923829c9bc2080a3e1bb9e2cac0:/IkiWiki/Plugin/recentchanges.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 04a878b20..a73ff37b9 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);
@@ -16,16 +17,20 @@ sub import { #{{{
 
 sub getsetup () { #{{{
 	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
 		recentchangespage => {
 			type => "string",
-			default => "recentchanges",
+			example => "recentchanges",
 			description => "name of the recentchanges page",
 			safe => 1,
 			rebuild => 1,
 		},
 		recentchangesnum => {
-			type => "int",
-			default => 100,
+			type => "integer",
+			example => 100,
 			description => "number of changes to track",
 			safe => 1,
 			rebuild => 0,
@@ -82,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");
 		}
@@ -99,7 +104,7 @@ sub cgi ($) { #{{{
 				"</p>");
 		}
 		else {
-			IkiWiki::redirect($cgi, $config{url}.IkiWiki::beautify_urlpath("/".htmlpage($link)));
+			IkiWiki::redirect($cgi, urlto($link, undef, 1));
 		}
 
 		exit;
@@ -109,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).
@@ -127,11 +132,11 @@ sub store ($$$) { #{{{
 						page => $_->{page}
 					).
 					"\">".
-					IkiWiki::pagetitle($_->{page}).
+					pagetitle($_->{page}).
 					"</a>"
 			}
 			else {
-				$_->{link} = IkiWiki::pagetitle($_->{page});
+				$_->{link} = pagetitle($_->{page});
 			}
 			$_->{baseurl}="$config{url}/" if length $config{url};
 
@@ -170,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});