[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - include five.pt if installed

[Yvo Schubbe]

Log message for revision 130344:
  - include five.pt if installed

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2013-10-16 09:19:33 UTC (rev 130343)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2013-10-16 09:31:36 UTC (rev 130344)
@@ -4,6 +4,9 @@
 2.3.0 (unreleased)
 ------------------
 
+- page templates: Improved Chameleon support.
+  If five.pt is installed, its zcml configuration is included.
+
 - interfaces: Fixed dotted names by setting __module__ explicitly.
 
 - profiles and upgrade: Added new `Members Folder` and `Home Folder` types.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml	2013-10-16 09:19:33 UTC (rev 130343)
+++ Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml	2013-10-16 09:31:36 UTC (rev 130344)
@@ -1,11 +1,15 @@
 <configure
-    xmlns="http://namespaces.zope.org/zope">
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml">
 
   <include package="zope.formlib"/>
 
   <include package="zope.annotation"/>
 
-  <!--<include package="five.pt"/>-->
+  <include
+      zcml:condition="installed five.pt"
+      package="five.pt"
+      />
 
   <include package=".skin"/>