[CMF-checkins] CVS: CMF/CMFDefault - SkinnedFolder.py:1.8.4.3

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv28354

Modified Files:
      Tag: CMF-1_3-branch
	SkinnedFolder.py 
Log Message:
Merged change from HEAD:

Simplified code.


=== CMF/CMFDefault/SkinnedFolder.py 1.8.4.2 => 1.8.4.3 ===
     Allow the "view" of a folder to be skinned by type.
 """
 
-from OFS.Folder import Folder
 from Products.CMFCore.PortalFolder import PortalFolder
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore import CMFCorePermissions
@@ -69,8 +68,7 @@
 
     security = ClassSecurityInfo()
 
-    manage_options = Folder.manage_options + \
-                     CMFCatalogAware.manage_options
+    manage_options = PortalFolder.manage_options
 
     def __call__(self):
         '''