[Zope-Checkins] SVN: Zope/trunk/ - Launchpad #262313: respect the 'Expand macros when editing' flag

[Andreas Jung]

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

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

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2008-08-29 10:44:47 UTC (rev 90571)
+++ Zope/trunk/doc/CHANGES.txt	2008-08-29 10:56:06 UTC (rev 90572)
@@ -207,6 +207,9 @@
 
     Bugs Fixed
 
+      - Launchpad #262313: respect the 'Expand macros when editing' flag
+        when editing a page template through the ZMI
+
       - Launchpad #257276: fix for possible denial-of-service attack
         in PythonScript when passing an arbitrary module to the encode()
         or decode() of strings.

Modified: Zope/trunk/lib/python/Products/PageTemplates/PageTemplate.py
===================================================================
--- Zope/trunk/lib/python/Products/PageTemplates/PageTemplate.py	2008-08-29 10:44:47 UTC (rev 90571)
+++ Zope/trunk/lib/python/Products/PageTemplates/PageTemplate.py	2008-08-29 10:56:06 UTC (rev 90572)
@@ -74,6 +74,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)