From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 26 Jan 2009 18:05:38 +0000 (-0500)
Subject: Merge branch 'master' into po
X-Git-Tag: 3.15~242
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12eb056b33e1f01a63c4fcee408c9ac0d96c6b5e;hp=--cc;p=ikiwiki.git

Merge branch 'master' into po
---

12eb056b33e1f01a63c4fcee408c9ac0d96c6b5e
diff --cc IkiWiki/Plugin/blogspam.pm
index d4b5b36d5,cbd9859a5..58303418f
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@@ -83,9 -83,9 +83,9 @@@ sub checkcontent (@) 
  	# and "buy".
  	push @options, "exclude=stopwords";
  
- 	my $res = $client->send_request('testComment', {
+ 	my %req=(
  		ip => $ENV{REMOTE_ADDR},
 -		comment => $params{content},
 +		comment => defined $params{diff} ? $params{diff} : $params{content},
  		subject => defined $params{subject} ? $params{subject} : "",
  		name => defined $params{author} ? $params{author} : "",
  		link => exists $params{url} ? $params{url} : "",