From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 31 Jan 2009 14:49:12 +0000 (+0000)
Subject: comments: delete cgi hook in favour of the global one
X-Git-Tag: 3.04~86^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e92548ebc39c083e7ed8b870f4c13ba229127cd;p=ikiwiki.git

comments: delete cgi hook in favour of the global one
---

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index cbb3374c2..995d1f4eb 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -25,7 +25,6 @@ sub import {
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
-	hook(type => "cgi", id => "comments", call => \&linkcgi);
 	hook(type => "formbuilder_setup", id => "comments", call => \&formbuilder_setup);
 	IkiWiki::loadplugin("inline");
 }
@@ -167,7 +166,7 @@ sub preprocess {
 		}
 		else {
 			$commentauthorurl = IkiWiki::cgiurl(
-				do => 'commenter',
+				do => 'goto',
 				page => (length $config{userdir}
 					? "$config{userdir}/$commentuser"
 					: "$commentuser"));
@@ -235,35 +234,6 @@ sub preprocess {
 	return $content;
 }
 
-# This is exactly the same as recentchanges_link :-(
-sub linkcgi ($) {
-	my $cgi=shift;
-	if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
-
-		my $page=decode_utf8($cgi->param("page"));
-		if (! defined $page) {
-			error("missing page parameter");
-		}
-
-		IkiWiki::loadindex();
-
-		my $link=bestlink("", $page);
-		if (! length $link) {
-			print "Content-type: text/html\n\n";
-			print IkiWiki::misctemplate(gettext(gettext("missing page")),
-				"<p>".
-				sprintf(gettext("The page %s does not exist."),
-					htmllink("", "", $page)).
-				"</p>");
-		}
-		else {
-			IkiWiki::redirect($cgi, urlto($link, undef, 1));
-		}
-
-		exit;
-	}
-}
-
 sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;