diff --git a/plone/app/discussion/browser/captcha.zcml b/plone/app/discussion/browser/captcha.zcml
index 32fb67e..114caf0 100644
--- a/plone/app/discussion/browser/captcha.zcml
+++ b/plone/app/discussion/browser/captcha.zcml
@@ -19,17 +19,13 @@
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/plone/app/discussion/browser/validator.py b/plone/app/discussion/browser/validator.py
index 54c773d..063242f 100644
--- a/plone/app/discussion/browser/validator.py
+++ b/plone/app/discussion/browser/validator.py
@@ -33,11 +33,6 @@ try:
except:
pass
-try:
- from collective.akismet.browser.validator import AkismetReject
-except:
- pass
-
from zope.interface import implements, Interface
from zope.schema.interfaces import IField
from zope.component import adapts
@@ -57,14 +52,11 @@ class CaptchaValidator(validator.SimpleFieldValidator):
registry = queryUtility(IRegistry)
settings = registry.forInterface(IDiscussionSettings)
- if settings.captcha != 'disabled':
+ if settings.captcha == 'captcha' or settings.captcha == 'recaptcha':
captcha = getMultiAdapter((aq_inner(self.context), self.request),
name=settings.captcha)
if not captcha.verify(input=value):
- if settings.captcha == 'akismet':
- raise AkismetReject
- else:
- raise WrongCaptchaCode
+ raise WrongCaptchaCode
else:
return True