Merge branch 'master' into bbmaster

This commit is contained in:
Helmut Merz 2012-06-01 14:37:52 +02:00
commit 9bc0c44e12

View file

@ -437,7 +437,8 @@ class IndexAttributes(object):
@Lazy @Lazy
def adaptedIndexAttributes(self): def adaptedIndexAttributes(self):
if self.adapted != self.context: #if self.adapted != self.context:
if isinstance(self.adapted, AdapterBase):
#return component.queryAdapter(self.adapted, IIndexAttributes) #return component.queryAdapter(self.adapted, IIndexAttributes)
return IIndexAttributes(self.adapted, None) return IIndexAttributes(self.adapted, None)