From c430792148b2193585dfed6cc2a5f778f7167de1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 8 Oct 2010 18:50:24 -0400
Subject: [PATCH] refactor

---
 IkiWiki/Plugin/recentchanges.pm | 46 ++++++++++++++-------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index fe414d865..88100af0f 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -61,31 +61,6 @@ sub refresh ($) {
 	}
 }
 
-sub confirmation_form {
-	my ($q, $session, $rev) = @_;
-
-	eval q{use CGI::FormBuilder};
-	error($@) if $@;
-	my $f = CGI::FormBuilder->new(
-		name => "revert",
-		header => 0,
-		charset => "utf-8",
-		method => 'POST',
-		javascript => 0,
-		params => $q,
-		action => $config{cgiurl},
-		stylesheet => 1,
-		template => { template('revert.tmpl') },
-	);
-
-	$f->field(name => "sid", type => "hidden", value => $session->id,
-		force => 1);
-	$f->field(name => "do", type => "hidden", value => "revert",
-		force => 1);
-
-	return $f, ["Revert", "Cancel"];
-}
-
 sub sessioncgi ($$) {
 	my ($q, $session) = @_;
 	my $do = $q->param('do');
@@ -100,7 +75,26 @@ sub sessioncgi ($$) {
 		changes => \@changes,
 	);
 
-	my ($form, $buttons) = confirmation_form($q, $session);
+	eval q{use CGI::FormBuilder};
+	error($@) if $@;
+	my $form = CGI::FormBuilder->new(
+		name => "revert",
+		header => 0,
+		charset => "utf-8",
+		method => 'POST',
+		javascript => 0,
+		params => $q,
+		action => $config{cgiurl},
+		stylesheet => 1,
+		template => { template('revert.tmpl') },
+	);
+	my $buttons=["Revert", "Cancel"];
+
+	$form->field(name => "sid", type => "hidden", value => $session->id,
+		force => 1);
+	$form->field(name => "do", type => "hidden", value => "revert",
+		force => 1);
+
 	IkiWiki::decode_form_utf8($form);
 
 	if ($form->submitted eq 'Revert' && $form->validate) {