[Erp5-report] r18390 - /erp5/trunk/products/ERP5Type/patches/CMFCoreSkinnable.py

[nobody at svn.erp5.org]

Author: yo
Date: Tue Dec 18 13:25:38 2007
New Revision: 18390

URL: http://svn.erp5.org?rev=18390&view=rev
Log:
Instead of checking if a name is portal_skins, include it in the ignored dict.

Modified:
    erp5/trunk/products/ERP5Type/patches/CMFCoreSkinnable.py

Modified: erp5/trunk/products/ERP5Type/patches/CMFCoreSkinnable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/CMFCoreSkinnable.py?rev=18390&r1=18389&r2=18390&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/CMFCoreSkinnable.py (original)
+++ erp5/trunk/products/ERP5Type/patches/CMFCoreSkinnable.py Tue Dec 18 13:25:38 2007
@@ -69,7 +69,7 @@
       try:
         return resolve[name]
       except KeyError:
-        if not ignore.has_key(name) and name != 'portal_skins':
+        if not ignore.has_key(name):
           try:
             portal_skins = aq_base(self.portal_skins)
           except AttributeError:
@@ -131,7 +131,7 @@
       if sf is not None:
         skinname = sf.getDefaultSkin()
   tid = get_ident()
-  SKINDATA[tid] = (skinname, {}, {})
+  SKINDATA[tid] = (skinname, {'portal_skins': None}, {})
   REQUEST = getattr(self, 'REQUEST', None)
   if REQUEST is not None:
     REQUEST._hold(SkinDataCleanup(tid))