merge r26270 from 1.x branch

svn path=/plone.theme/trunk/; revision=26271
plone · Apr 4, 2009 · c28c539 · c28c539
1 parent cde0205
commit c28c539
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -14,8 +14,12 @@ plone.theme - 2.0
 - Specify package dependencies.
   [hannosch]
 
+plone.theme - 1.1
+
+    - Make sure the theme layer takes precedence over other browser layers.
+      [davisagli]
+
 plone.theme - 1.0  August 15, 2007
 
 - First stable release
   [wichert]
-
diff --git a/plone/theme/layer.py b/plone/theme/layer.py
@@ -1,8 +1,7 @@
-from zope.interface import alsoProvides
+from zope.interface import directlyProvides, directlyProvidedBy
 from zope.component import queryUtility
 
 from zope.publisher.interfaces.browser import IBrowserSkinType
-from zope.publisher.browser import applySkin
 
 from Products.CMFCore.utils import getToolByName
 
@@ -15,4 +14,6 @@ def mark_layer(site, event):
         skin_name = site.getCurrentSkinName()
         skin = queryUtility(IBrowserSkinType, name=skin_name)
         if skin is not None:
-            applySkin(event.request, skin)
+            ifaces = [skin,] + [l for l in directlyProvidedBy(event.request)
+                if not IBrowserSkinType.providedBy(l)]
+            directlyProvides(event.request, *ifaces)