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

[Andreas Jung]

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

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

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.11/doc/CHANGES.txt	2008-08-29 10:56:06 UTC (rev 90572)
+++ Zope/branches/2.11/doc/CHANGES.txt	2008-08-29 10:58:27 UTC (rev 90573)
@@ -16,7 +16,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.11.1 (2008/07/17)
 
     Bugs Fixed

Modified: Zope/branches/2.11/lib/python/Products/PageTemplates/PageTemplate.py
===================================================================
--- Zope/branches/2.11/lib/python/Products/PageTemplates/PageTemplate.py	2008-08-29 10:56:06 UTC (rev 90572)
+++ Zope/branches/2.11/lib/python/Products/PageTemplates/PageTemplate.py	2008-08-29 10:58:27 UTC (rev 90573)
@@ -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)