X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c430792148b2193585dfed6cc2a5f778f7167de1..468c1c4496eade7a1a4ff6fe22aa82f5eefd3164:/IkiWiki/Plugin/recentchanges.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 88100af0f..6fccd16f6 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -84,12 +84,14 @@ sub sessioncgi ($$) {
 		method => 'POST',
 		javascript => 0,
 		params => $q,
-		action => $config{cgiurl},
+		action => IkiWiki::cgiurl(),
 		stylesheet => 1,
 		template => { template('revert.tmpl') },
+		fields => [qw{revertmessage do sid rev}],
 	);
 	my $buttons=["Revert", "Cancel"];
 
+	$form->field(name => "revertmessage", type => "text", size => 80);
 	$form->field(name => "sid", type => "hidden", value => $session->id,
 		force => 1);
 	$form->field(name => "do", type => "hidden", value => "revert",
@@ -99,25 +101,23 @@ sub sessioncgi ($$) {
 
 	if ($form->submitted eq 'Revert' && $form->validate) {
 		IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
-		IkiWiki::disable_commit_hook();
-		my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
-		if (! defined $r) { # success
-			rcs_commit_staged(
-				message => sprintf(gettext("This reverts commit %s"), $rev),
-				session => $session,
-				rev => $rev,
-			);
+		my $message=sprintf(gettext("This reverts commit %s"), $rev);
+		if (defined $form->field('revertmessage') &&
+		    length $form->field('revertmessage')) {
+			$message=$form->field('revertmessage')."\n\n".$message;
 		}
+		my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
+		error $r if defined $r;
+		IkiWiki::disable_commit_hook();
+		IkiWiki::rcs_commit_staged(
+			message => $message,
+			session => $session,
+		);
 		IkiWiki::enable_commit_hook();
 	
-		if (defined $r) {
-			die "Revert '$rev' failed.";
-		}
-		else {
-			require IkiWiki::Render;
-			IkiWiki::refresh();
-			IkiWiki::saveindex();
-		}
+		require IkiWiki::Render;
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
 	}
 	elsif ($form->submitted ne 'Cancel') {
 	        $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
@@ -127,7 +127,7 @@ sub sessioncgi ($$) {
 		exit 0;
 	}
 
-	IkiWiki::redirect($q, urlto($config{recentchangespage}, ''));
+	IkiWiki::redirect($q, urlto($config{recentchangespage}));
 	exit 0;
 }
 
@@ -178,7 +178,7 @@ sub store ($$$) {
 			else {
 				$_->{link} = pagetitle($_->{page});
 			}
-			$_->{baseurl}="$config{url}/" if length $config{url};
+			$_->{baseurl}=IkiWiki::baseurl(undef) if length $config{url};
 
 			$_;
 		} @{$change->{pages}}
@@ -226,7 +226,7 @@ sub store ($$$) {
 		wikiname => $config{wikiname},
 	);
 	
-	$template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+	$template->param(permalink => urlto($config{recentchangespage}, undef)."#change-".titlepage($change->{rev}))
 		if exists $config{url};
 	
 	IkiWiki::run_hooks(pagetemplate => sub {