X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2c5fbe844b3137b2e3f84d5f1d1ea9ef37564852..f59d7f1e9b3851dd86acf9d46096ca8de6fad540:/IkiWiki/Plugin/editdiff.pm

diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index 46eb1168e..9872e9686 100644
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -25,7 +25,7 @@ sub diff ($$) { #{{{
 
 	print DIFFIN $content;
 	close DIFFIN;
-	my $ret;
+	my $ret='';
 	while (<DIFFOUT>) {
 		if (defined $ret) {
 			$ret.=$_;
@@ -46,12 +46,11 @@ sub diff ($$) { #{{{
 sub formbuilder_setup { #{{{
 	my %params=@_;
 	my $form=$params{form};
-	my $page=$form->field("page");
 
-	return if $form->title ne "editpage"
-	          || $form->field("do") ne "edit";
+	return if defined ! $form->field("do") || $form->field("do") ne "edit";
 
-	$page = IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($page));
+	my $page=$form->field("page");
+	$page = IkiWiki::possibly_foolish_untaint($page);
 	return unless exists $pagesources{$page};
 
 	push @{$params{buttons}}, "Diff";