[ZPT] CVS: Products/PageTemplates - CHANGES.txt:1.17.2.3 Expressions.py:1.19.2.1

[Evan Simpson]

Update of /cvs-repository/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv25338

Modified Files:
      Tag: zpt-1_4_0
	CHANGES.txt Expressions.py 
Log Message:



=== Products/PageTemplates/CHANGES.txt 1.17.2.2 => 1.17.2.3 ===
         - If a PageTemplate was owned by a missing user, or one with
           insufficient permissions, the editing form broke.
+
+        - PageTemplateFiles didn't bind 'user'.


=== Products/PageTemplates/Expressions.py 1.19 => 1.19.2.1 ===
                     
             container = None
-            if (has(get(object, 'aq_base', object), name)
-                and get(object, name) is o):
+            if has(o, 'im_self'):
+                container = o.im_self
+            elif (has(get(object, 'aq_base', object), name)
+                and get(object, name) == o):
                 container = object
             if not validate(object, container, name, o):
                 raise 'Unauthorized', name