Commit 23b22fd6 authored by Wichert Akkerman's avatar Wichert Akkerman

Merge changes from 2.12 branch

parent c783eac2
......@@ -219,8 +219,10 @@ class ZPublisherExceptionHook:
# zope.publisher uses as well.
view = queryMultiAdapter((v, REQUEST), name=u'index.html')
if view is not None:
if IAcquirer.providedBy(published):
if IAcquirer.providedBy(view) and IAcquirer.providedBy(published):
view = view.__of__(published)
else:
view.__parent__ = published
v = view()
response = REQUEST.RESPONSE
response.setStatus(t)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment