Commit 61904198 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Instead of checking if a name is portal_skins, include it in the ignored dict.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18390 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a91ab9b6
...@@ -69,7 +69,7 @@ def CMFCoreSkinnableSkinnableObjectManager___getattr__(self, name): ...@@ -69,7 +69,7 @@ def CMFCoreSkinnableSkinnableObjectManager___getattr__(self, name):
try: try:
return resolve[name] return resolve[name]
except KeyError: except KeyError:
if not ignore.has_key(name) and name != 'portal_skins': if not ignore.has_key(name):
try: try:
portal_skins = aq_base(self.portal_skins) portal_skins = aq_base(self.portal_skins)
except AttributeError: except AttributeError:
...@@ -131,7 +131,7 @@ def CMFCoreSkinnableSkinnableObjectManager_changeSkin(self, skinname): ...@@ -131,7 +131,7 @@ def CMFCoreSkinnableSkinnableObjectManager_changeSkin(self, skinname):
if sf is not None: if sf is not None:
skinname = sf.getDefaultSkin() skinname = sf.getDefaultSkin()
tid = get_ident() tid = get_ident()
SKINDATA[tid] = (skinname, {}, {}) SKINDATA[tid] = (skinname, {'portal_skins': None}, {})
REQUEST = getattr(self, 'REQUEST', None) REQUEST = getattr(self, 'REQUEST', None)
if REQUEST is not None: if REQUEST is not None:
REQUEST._hold(SkinDataCleanup(tid)) REQUEST._hold(SkinDataCleanup(tid))
......
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