[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - PageTemplate.py:1.21.18.1 ZopePageTemplate.py:1.30.18.1

[Casey Duncan]

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv22094/lib/python/Products/PageTemplates

Modified Files:
      Tag: casey-death_to_index_html-branch
	PageTemplate.py ZopePageTemplate.py 
Log Message:
Updating branch to head for testing


=== Zope/lib/python/Products/PageTemplates/PageTemplate.py 1.21 => 1.21.18.1 ===
      
     content_type = 'text/html'
-    expand = 1
+    expand = 0
     _v_errors = ()
     _v_warnings = ()
     id = '(unknown)'


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.30 => 1.30.18.1 ===
     PUT = document_src = Acquisition.Acquired
     index_html = None
+
+    def __before_publishing_traverse__(self, ob, request):
+        if getattr(request, '_hacked_path', 0):
+            request._hacked_path = 0
     
     def __call__(self, REQUEST, RESPONSE):
         " "
-        return self.document_src(REQUEST, RESPONSE)
+        return self.document_src(REQUEST)
 
 d = ZopePageTemplate.__dict__
 d['source.xml'] = d['source.html'] = Src()