Log message for revision 90574:
  - Launchpad #262313: respect the 'Expand macros when editing' flag
    when editing a page template through the ZMI
  

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplate.py

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10/doc/CHANGES.txt  2008-08-29 10:58:27 UTC (rev 90573)
+++ Zope/branches/2.10/doc/CHANGES.txt  2008-08-29 10:59:35 UTC (rev 90574)
@@ -24,7 +24,10 @@
 
       - integrated Hotfix-2008-08-12
 
+      - Launchpad #262313: respect the 'Expand macros when editing' flag
+        when editing a page template through the ZMI
 
+
   Zope 2.10.6 (2008/05/10)
 
     Bugs fixed

Modified: Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplate.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplate.py        
2008-08-29 10:58:27 UTC (rev 90573)
+++ Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplate.py        
2008-08-29 10:59:35 UTC (rev 90574)
@@ -92,6 +92,8 @@
             sourceAnnotations = getattr(debug, 'sourceAnnotations', False)
         else:
             showtal = sourceAnnotations = False
+        if source:
+            showtal = True
         return super(PageTemplate, self).pt_render(c, source=source, 
sourceAnnotations=sourceAnnotations,
                    showtal=showtal)
 

_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

Reply via email to