Products.CMFPlone/master: Merge pull request #2106 from plone/MrTango_fix_addforms_if_
GitHub <jenkins-z4DKO/[email protected]>
| Newsgroups | gmane.comp.web.zope.plone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Repository: Products.CMFPlone Branch: refs/heads/master Date: 2017-07-14T15:05:46+02:00 Author: Maik Derstappen (MrTango) <md-r4/[email protected]> Commit: https://github.com/plone/Products.CMFPlone/commit/aff66778e4fa38da5eee984817b242f3153e516e Merge pull request #2106 from plone/MrTango_fix_addforms_if_formlib_is_installed_too Mr tango fix addforms if formlib is installed too Files changed: M CHANGES.rst M Products/CMFPlone/meta.zcml diff --git a/CHANGES.rst b/CHANGES.rst index 70ea76cd5..1891a1a7a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -22,6 +22,9 @@ Bug fixes: - add :focus class on toolbar for keyboard users (https://github.com/plone/Products.CMFPlone/issues/1620) [polyester] +- Fix empty DX add_forms if formlib is also installed thru addon dependencies + [MrTango] + 5.1b4 (2017-07-03) ------------------ diff --git a/Products/CMFPlone/meta.zcml b/Products/CMFPlone/meta.zcml index a317b7399..a4542c655 100644 --- a/Products/CMFPlone/meta.zcml +++ b/Products/CMFPlone/meta.zcml @@ -18,6 +18,12 @@ <meta:provides feature="plone-5" /> <meta:provides feature="plone-51" /> + <configure zcml:condition="installed Products.CMFDefault"> + <exclude package="Products.CMFDefault.browser" file="configure.zcml" /> + <exclude package="Products.CMFDefault.formlib" file="configure.zcml" /> + <exclude package="Products.CMFDefault.upgrade" file="configure.zcml" /> + </configure> + <include package="Products.CMFCore" file="meta.zcml" /> <include package="Products.GenericSetup" file="meta.zcml" /> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot