r13466 - in Products.Archetypes/trunk: . Products/Archetypes

Author: mj
Date: Tue Feb  8 15:56:44 2011
New Revision: 13466

Modified:
   Products.Archetypes/trunk/   (props changed)
   Products.Archetypes/trunk/CHANGES.txt
   Products.Archetypes/trunk/Products/Archetypes/   (props changed)
   Products.Archetypes/trunk/Products/Archetypes/ExtensibleMetadata.py
Log:
Merge r13465 from the 1.6 branch

Modified: Products.Archetypes/trunk/CHANGES.txt
==============================================================================
--- Products.Archetypes/trunk/CHANGES.txt	(original)
+++ Products.Archetypes/trunk/CHANGES.txt	Tue Feb  8 15:56:44 2011
@@ -4,6 +4,11 @@
 1.7.3 - Unreleased
 ------------------
 
+- Fixed handling of Anonymous ownership in ExtensibleMetadata, where the
+  ownership tuple is None. Also triggered for views on FactoryTool-wrapped
+  objects.
+  [mj]
+
 1.7.2 - 2011-02-04
 ------------------
 

Modified: Products.Archetypes/trunk/Products/Archetypes/ExtensibleMetadata.py
==============================================================================
--- Products.Archetypes/trunk/Products/Archetypes/ExtensibleMetadata.py	(original)
+++ Products.Archetypes/trunk/Products/Archetypes/ExtensibleMetadata.py	Tue Feb  8 15:56:44 2011
@@ -602,7 +602,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