summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-04-22 13:33:20 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-04-22 13:33:20 -0400
commit55377e7336070c4d2a3da1473666accf13d64325 (patch)
treebf3cb45ee40e41123c947f9dd277bb6cd0f0feb2 /IkiWiki
parent4fbe1c3d447d875562b6c6a43ac702101eae3953 (diff)
blogspam: Load RPC::XML library in checkconfig, so that an error can be printed at that point if it's not available, allowing the admin to see it during wiki setup. Closes: #520015
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/blogspam.pm17
1 files changed, 10 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index cbd9859a5..c9883fbc2 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -9,6 +9,7 @@ my $defaulturl='http://test.blogspam.net:8888/';
sub import {
hook(type => "getsetup", id => "blogspam", call => \&getsetup);
+ hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
hook(type => "checkcontent", id => "blogspam", call => \&checkcontent);
}
@@ -43,17 +44,19 @@ sub getsetup () {
},
}
-sub checkcontent (@) {
- my %params=@_;
-
+sub checkconfig () {
+ # This is done at checkconfig time because printing an error
+ # if the module is missing when a spam is posted would not
+ # let the admin know about the problem.
eval q{
use RPC::XML;
use RPC::XML::Client;
};
- if ($@) {
- warn($@);
- return undef;
- }
+ error $@ if $@;
+}
+
+sub checkcontent (@) {
+ my %params=@_;
if (exists $config{blogspam_pagespec}) {
return undef