- Launchpad #262313: respect the 'Expand macros when editing' flag

  when editing a page template through the ZMI

doc/CHANGES.txt

@@ -207,6 +207,9 @@ Zope Changes
 
     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.

lib/python/Products/PageTemplates/PageTemplate.py

@@ -74,6 +74,8 @@ class PageTemplate(ExtensionClass.Base,
             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)