Merge pull request #234 from plone/hcaptcha-fix-master-branch

jensens · web-flow · commit 3d60532720c9 · 2024-03-20T23:48:06.000+01:00
Apply validation for all captchas
diff --git a/news/234.bugfix b/news/234.bugfix
@@ -0,0 +1 @@
+Apply validation for all captchas. @ksuess
diff --git a/plone/app/discussion/browser/validator.py b/plone/app/discussion/browser/validator.py
@@ -49,7 +49,7 @@ def validate(self, value):
         registry = queryUtility(IRegistry)
         settings = registry.forInterface(IDiscussionSettings, check=False)
 
-        if settings.captcha in ("captcha", "recaptcha", "norobots"):
+        if settings.captcha != "disabled":
             captcha = getMultiAdapter(
                 (aq_inner(self.context), self.request), name=settings.captcha
             )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Apply validation for all captchas. @ksuess`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ def validate(self, value):`
`49`	`49`	`registry = queryUtility(IRegistry)`
`50`	`50`	`settings = registry.forInterface(IDiscussionSettings, check=False)`
`51`	`51`
`52`		`- if settings.captcha in ("captcha", "recaptcha", "norobots"):`
	`52`	`+ if settings.captcha != "disabled":`
`53`	`53`	`captcha = getMultiAdapter(`
`54`	`54`	`(aq_inner(self.context), self.request), name=settings.captcha`
`55`	`55`	`)`