Commit 5dee3616 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

if ignore_layout is specified, do not change skin at all.

otherwise the result is unpredictable.
parent 76919bdc
...@@ -110,10 +110,11 @@ class WebSiteTraversalHook(Persistent): ...@@ -110,10 +110,11 @@ class WebSiteTraversalHook(Persistent):
self._v_request = request self._v_request = request
request.physicalPathToVirtualPath = self._physicalPathToVirtualPath request.physicalPathToVirtualPath = self._physicalPathToVirtualPath
# If a skin selection is defined in this web site, change the skin now. if not request.get('ignore_layout', None):
skin_selection_name = container.getSkinSelectionName() # If a skin selection is defined in this web site, change the skin now.
if skin_selection_name and request.get('portal_skin', None) is None: skin_selection_name = container.getSkinSelectionName()
container.getPortalObject().changeSkin(skin_selection_name) if skin_selection_name and request.get('portal_skin', None) is None:
container.getPortalObject().changeSkin(skin_selection_name)
# Set default language if any # Set default language if any
default_language = container.getDefaultAvailableLanguage() default_language = container.getDefaultAvailableLanguage()
......
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