fix regression in traversal of plone.app.folder.base.ReplaceableWrapper

zopefoundation · Apr 3, 2017 · 8dd7c58 · 8dd7c58
1 parent 842baa5
commit 8dd7c58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -42,6 +42,11 @@ Bugs Fixed
   [MrTango]
 
 
+- Fix regression in traversing to WebDAV NullResources if the final object
+  in the path is a proxy that provides access to aq_inner but is not itself
+  an acquisition wrapper.
+  [davisagli]
+
 Features Added
 ++++++++++++++
 

diff --git a/src/ZPublisher/BaseRequest.py b/src/ZPublisher/BaseRequest.py
@@ -477,8 +477,7 @@ def traverse(self, path, response=None, validated_hook=None):
                             hasattr(object, 'aq_base') and
                             not hasattr(object, '__bobo_traverse__')):
 
-                        if (object.__parent__ is not
-                                aq_inner(object).__parent__):
+                        if object.__parent__ is not object.aq_inner.__parent__:
                             object = NullResource(parents[-2], object.getId(),
                                                   self).__of__(parents[-2])