[Zope-Checkins] SVN: Zope/trunk/src/Zope2/App/startup.py Merge changes from 2.12 branch

[Wichert Akkerman]

Log message for revision 110786:
  Merge changes from 2.12 branch

Changed:
  U   Zope/trunk/src/Zope2/App/startup.py

-=-
Modified: Zope/trunk/src/Zope2/App/startup.py
===================================================================
--- Zope/trunk/src/Zope2/App/startup.py	2010-04-13 12:43:06 UTC (rev 110785)
+++ Zope/trunk/src/Zope2/App/startup.py	2010-04-13 12:44:02 UTC (rev 110786)
@@ -219,8 +219,10 @@
             # 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)