ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22 from maartenkling/master

Browse Source 
first check if captcha is installed before we open browsers zcml
This commit is contained in:
Timo Stollenwerk 2012-11-28 00:43:15 -08:00
commit b23415943a
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -10,6 +10,10 @@ Changelog
2.2.1 (2012-11-16) 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. - Make conversation view not break when comment-id cannot be converted to long.
Fixes #13327 Fixes #13327
[khink] [khink]

19
plone/app/discussion/configure.zcml
View File

@ -18,6 +18,17 @@
<include file="notifications.zcml" /> <include file="notifications.zcml" />
<include file="subscribers.zcml" /> <include file="subscribers.zcml" />
<include file="upgrades.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" /> <include package=".browser" />
<i18n:registerTranslations directory="locales" /> <i18n:registerTranslations directory="locales" />
@ -81,14 +92,6 @@
name="plone.app.discussion.vocabularies.TextTransformVocabulary" name="plone.app.discussion.vocabularies.TextTransformVocabulary"
provides="zope.schema.interfaces.IVocabularyFactory" /> 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 --> <!-- Conversation indexes -->
<adapter name="total_comments" factory=".catalog.total_comments" /> <adapter name="total_comments" factory=".catalog.total_comments" />
<adapter name="last_comment_date" factory=".catalog.last_comment_date" /> <adapter name="last_comment_date" factory=".catalog.last_comment_date" />