Merge pull request #22 from maartenkling/master

first check if captcha is installed before we open browsers zcml

CHANGES.txt

@@ -10,6 +10,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]

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" />