r13467 - in Products.Archetypes/branches/1.5: . Products Products/Archetypes

Author: mj
Date: Tue Feb  8 20:29:31 2011
New Revision: 13467

Modified:
   Products.Archetypes/branches/1.5/   (props changed)
   Products.Archetypes/branches/1.5/Products/   (props changed)
   Products.Archetypes/branches/1.5/Products/Archetypes/ExtensibleMetadata.py
Log:
Merge r13465 from the 1.6 branch

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/ExtensibleMetadata.py
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/ExtensibleMetadata.py	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/ExtensibleMetadata.py	Tue Feb  8 20:29:31 2011
@@ -593,7 +593,8 @@
         creators = self.Schema()['creators']
         if not creators.get(self):
             # for content created with CMF versions before 1.5
-            owner_id = self.getOwnerTuple()[1]
+            owner_tuple = self.getOwnerTuple()
+            owner_id = owner_tuple and owner_tuple[1]
             if owner_id:
                 creators.set(self, (owner_id,))
             else:

------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb