[CMF-checkins] CVS: CMF - Portal.py:1.18 __init__.py:1.6

[tseaver@digicool.com]

Update of /cvs-repository/CMF/CMFDefault
In directory korak.digicool.com:/tmp/cvs-serv24362/CMFDefault

Modified Files:
	Portal.py __init__.py 
Log Message:
 - Merge cleanup


--- Updated File Portal.py in package CMF --
--- Portal.py	2001/05/25 13:32:44	1.17
+++ Portal.py	2001/05/26 04:39:13	1.18
@@ -101,7 +101,6 @@
                            + Favorite.factory_type_information
                            )
 
-members_roster = '''<dtml-return roster>'''
 
 class CMFSite ( PortalObjectBase
               , DefaultDublinCoreImpl

--- Updated File __init__.py in package CMF --
--- __init__.py	2001/05/18 21:29:46	1.5
+++ __init__.py	2001/05/26 04:39:13	1.6
@@ -88,7 +88,7 @@
 ADD_CONTENT_PERMISSION = 'Add portal content'
  
 import Portal
-import Document, Link, NewsItem, File, Image, Favorite
+import Document, Link, NewsItem, File, Image, Favorite, SkinnedFolder
 import Discussions, DiscussionItem
 import PropertiesTool, MembershipTool, MetadataTool
 import RegistrationTool, URLTool, DublinCore, DiscussionTool
@@ -129,12 +129,13 @@
     Products.PTKBase.NewsItem = NewsItem
 
 contentClasses = ( Document.Document
-                   , File.File
-                   , Image.Image
-                   , Link.Link
-                   , Favorite.Favorite
-                   , NewsItem.NewsItem
-                   )
+                 , File.File
+                 , Image.Image
+                 , Link.Link
+                 , Favorite.Favorite
+                 , NewsItem.NewsItem
+                 , SkinnedFolder.SkinnedFolder
+                 )
 
 contentConstructors = ( Document.addDocument
                         , File.addFile