[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/browser/resource.py Merge c110799 from svn+ssh://svn.zope.org/repos/main/Zope/branches/2.12

[Martin Aspeli]

Log message for revision 110800:
  Merge c110799 from svn+ssh://svn.zope.org/repos/main/Zope/branches/2.12

Changed:
  U   Zope/trunk/src/Products/Five/browser/resource.py

-=-
Modified: Zope/trunk/src/Products/Five/browser/resource.py
===================================================================
--- Zope/trunk/src/Products/Five/browser/resource.py	2010-04-13 14:43:07 UTC (rev 110799)
+++ Zope/trunk/src/Products/Five/browser/resource.py	2010-04-13 14:47:33 UTC (rev 110800)
@@ -27,6 +27,7 @@
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.ptresource.ptresource import PageTemplate
 
+from Acquisition import aq_base
 from Products.Five.browser import BrowserView
 
 
@@ -165,7 +166,8 @@
         
         # We need to propagate security so that restrictedTraverse() will
         # work
-        resource.__roles__ = self.__roles__
+        if hasattr(aq_base(self), '__roles__'):
+            resource.__roles__ = self.__roles__
         
         return resource