blogspam: Fix use of blogspam_options and blogspam_server config settings.

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 8552f3a1ba549d05cdd472e42bca8bfdf61fb007..cbd9859a533cf58dba27e1af20dc04368ab66e5e 100644 (file)
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -62,11 +62,11 @@ sub checkcontent (@) {
        }
 
        my $url=$defaulturl;
        }
 
        my $url=$defaulturl;

-       $url = $params{blogspam_server} if exists $params{blogspam_server};
+       $url = $config{blogspam_server} if exists $config{blogspam_server};

        my $client = RPC::XML::Client->new($url);
 
        my $client = RPC::XML::Client->new($url);
 

-       my @options = split(",", $params{blogspam_options})
-               if exists $params{blogspam_options};
+       my @options = split(",", $config{blogspam_options})
+               if exists $config{blogspam_options};

 
        # Allow short comments and whitespace-only edits, unless the user
        # has overridden min-words themselves.
 
        # Allow short comments and whitespace-only edits, unless the user
        # has overridden min-words themselves.

diff --git a/debian/changelog b/debian/changelog
index 7f6605fbf069151562ab184e68c4b4b190c289cb..96089c101b83eb107207e9f1ad3e46ebb99f78d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ikiwiki (3.03) UNRELEASED; urgency=low
 
   * Avoid feeding decoded unicode to Term::ReadLine.
     Closes: 512169
 
   * Avoid feeding decoded unicode to Term::ReadLine.
     Closes: 512169

-  * blogspam: Log spam info on failure.
+  * blogspam: Log spam info on failure in debug mode.

   * Remove nonstandard css. Closes: #512378
   * Remove nonstandard css. Closes: #512378

+  * blogspam: Fix use of blogspam_options and blogspam_server
+    config settings.

 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500