From 412cfed5c5fde729436cf4a82ffa34c623210772 Mon Sep 17 00:00:00 2001
From: maartenkling <maarten@fourdigits.nl>
Date: Mon, 26 Nov 2012 14:50:07 +0100
Subject: [PATCH 1/2] first check if captcha is installed before we open
 browsers zcml files that depend on these packages, fixes #12118 and #12774

---
 plone/app/discussion/configure.zcml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index 57c23d5..ed82463 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -18,6 +18,17 @@
     <include file="notifications.zcml" />
     <include file="subscribers.zcml" />
     <include file="upgrades.zcml" />
+
+    <!-- load captch before browser -->
+    <configure zcml:condition="installed plone.formwidget.captcha">
+      <include package="plone.formwidget.captcha" />
+    </configure>
+    <configure zcml:condition="installed plone.formwidget.recaptcha">
+      <include package="plone.formwidget.recaptcha" />
+    </configure>
+    <configure zcml:condition="installed collective.z3cform.norobots">
+      <include package="collective.z3cform.norobots" />
+    </configure>
     <include package=".browser" />
 
     <i18n:registerTranslations directory="locales" />
@@ -81,14 +92,6 @@
              name="plone.app.discussion.vocabularies.TextTransformVocabulary"
              provides="zope.schema.interfaces.IVocabularyFactory" />
 
-    <configure zcml:condition="installed plone.formwidget.captcha">
-      <include package="plone.formwidget.captcha" />
-    </configure>
-
-    <configure zcml:condition="installed plone.formwidget.recaptcha">
-      <include package="plone.formwidget.recaptcha" />
-    </configure>
-
     <!-- Conversation indexes -->
     <adapter name="total_comments" factory=".catalog.total_comments" />
     <adapter name="last_comment_date" factory=".catalog.last_comment_date" />

From 4b7ecf9e290b898891b3c480fb434f9aef8996fc Mon Sep 17 00:00:00 2001
From: maartenkling <maarten@fourdigits.nl>
Date: Mon, 26 Nov 2012 14:51:29 +0100
Subject: [PATCH 2/2] update changes

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9e36c64..97cc265 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 2.2.1 (2012-11-16)
 ------------------
 
+- first check if captcha is installed before we open browsers zcml
+  files that depend on these packages, fixes #12118 and #12774
+  [maartenkling]
+
 - Make conversation view not break when comment-id cannot be converted to long.
   Fixes #13327
   [khink]