[CMF-checkins] CVS: Products/CMFDefault - DublinCore.py:1.27.2.3 SkinnedFolder.py:1.13.4.5

[Florent Guillaume]

Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv11412/CMFDefault

Modified Files:
      Tag: CMF-1_4-branch
	DublinCore.py SkinnedFolder.py 
Log Message:
Fixed Creator() to not call a potentially costly method on the user
folder. (http://zope.org/Collectors/CMF/300)



=== Products/CMFDefault/DublinCore.py 1.27.2.2 => 1.27.2.3 ===
--- Products/CMFDefault/DublinCore.py:1.27.2.2	Sun Aug  1 16:51:11 2004
+++ Products/CMFDefault/DublinCore.py	Fri Mar 25 11:19:24 2005
@@ -103,9 +103,9 @@
         # XXX: fixme using 'portal_membership' -- should iterate over
         #       *all* owners
         "Dublin Core element - resource creator"
-        owner = self.getOwner()
-        if hasattr( owner, 'getId' ):
-            return owner.getId()
+        owner_tuple = self.getOwnerTuple()
+        if owner_tuple:
+            return owner_tuple[1]
         return 'No owner'
 
     security.declarePublic( 'Subject' )


=== Products/CMFDefault/SkinnedFolder.py 1.13.4.4 => 1.13.4.5 ===
--- Products/CMFDefault/SkinnedFolder.py:1.13.4.4	Wed Mar 16 12:57:54 2005
+++ Products/CMFDefault/SkinnedFolder.py	Fri Mar 25 11:19:24 2005
@@ -89,9 +89,9 @@
         """
             Return the ID of our owner.
         """
-        owner = self.getOwner()
-        if hasattr( owner, 'getId' ):
-            return owner.getId()
+        owner_tuple = self.getOwnerTuple()
+        if owner_tuple:
+            return owner_tuple[1]
         return 'No owner'
 
     # We derive from CMFCatalogAware first, so we are cataloged too.