[CMF-checkins] CVS: Products/CMFDefault - Document.py:1.68 Link.py:1.31

[Stefan H. Holek]

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

Modified Files:
	Document.py Link.py 
Log Message:
WebDAV PUT() caused improper splitting of 'Contributors' metadata header.


=== Products/CMFDefault/Document.py 1.67 => 1.68 ===
--- Products/CMFDefault/Document.py:1.67	Wed May 26 15:05:35 2004
+++ Products/CMFDefault/Document.py	Sat Jul 31 10:06:33 2004
@@ -25,6 +25,7 @@
 
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFCore.utils import keywordsplitter
+from Products.CMFCore.utils import contributorsplitter
 
 from DublinCore import DefaultDublinCoreImpl
 from exceptions import EditingConflict
@@ -174,9 +175,11 @@
         headers['Format'] = self.Format()
         new_subject = keywordsplitter(headers)
         headers['Subject'] = new_subject or self.Subject()
+        new_contrib = contributorsplitter(headers)
+        headers['Contributors'] = new_contrib or self.Contributors()
         haveheader = headers.has_key
         for key, value in self.getMetadataHeaders():
-            if key != 'Format' and not haveheader(key):
+            if not haveheader(key):
                 headers[key] = value
         self._editMetadata(title=headers['Title'],
                           subject=headers['Subject'],


=== Products/CMFDefault/Link.py 1.30 => 1.31 ===
--- Products/CMFDefault/Link.py:1.30	Thu Apr 29 12:13:17 2004
+++ Products/CMFDefault/Link.py	Sat Jul 31 10:06:33 2004
@@ -24,6 +24,7 @@
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFCore.WorkflowCore import WorkflowAction
 from Products.CMFCore.utils import keywordsplitter
+from Products.CMFCore.utils import contributorsplitter
 
 from DublinCore import DefaultDublinCoreImpl
 from permissions import View
@@ -176,9 +177,11 @@
         headers['Format'] = self.URL_FORMAT
         new_subject = keywordsplitter(headers)
         headers['Subject'] = new_subject or self.Subject()
+        new_contrib = contributorsplitter(headers)
+        headers['Contributors'] = new_contrib or self.Contributors()
         haveheader = headers.has_key
         for key, value in self.getMetadataHeaders():
-            if key != 'Format' and not haveheader(key):
+            if not haveheader(key):
                 headers[key] = value
 
         self._editMetadata(title=headers['Title'],