- Collector #2269: fixed broken FTP support for ZPT

doc/CHANGES.txt

@@ -12,6 +12,8 @@ Zope Changes
 
       - Collector #2261: Acquisition when creating objects via Webdav.
 
+      - Collector #2269: fixed broken FTP support for ZPT
+
   Zope 2.10.2 beta 1 (2007/01/14)
 
     Bugs fixed

lib/python/Products/PageTemplates/ZopePageTemplate.py

@@ -359,7 +359,7 @@ class ZopePageTemplate(Script, PageTemplate, Historical, Cacheable,
     security.declareProtected(ftp_access, 'manage_FTPget')
     def manage_FTPget(self):
         "Get source for FTP download"
-        result = self.pt_render()
+        result = self.read()
         return result.encode(self.output_encoding)
 
     security.declareProtected(view_management_screens, 'html')

lib/python/Products/PageTemplates/tests/testZopePageTemplate.py

@@ -249,6 +249,14 @@ class ZPTRegressions(unittest.TestCase):
         pt = self.app.pt1
         self.assertEqual(pt.document_src(), self.text)
 
+    def testFTPGet(self):
+        # check for bug #2269
+        request = self.app.REQUEST
+        text = '<span tal:content="string:foobar"></span>'
+        self._addPT('pt1', text=text, REQUEST=request)
+        result = self.app.pt1.manage_FTPget()
+        self.assertEqual(result, text)
+
 
 class ZPTMacros(zope.component.testing.PlacelessSetup, unittest.TestCase):