[CMF-checkins] CVS: Products/CMFDefault - Document.py:1.56.4.3 Link.py:1.26.4.3

[Stefan H. Holek]

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

Modified Files:
      Tag: CMF-1_4-branch
	Document.py Link.py 
Log Message:
WebDAV PUT caused improper splitting of the 'Contributors' metadata header.
Also see http://plone.org/collector/3217


=== Products/CMFDefault/Document.py 1.56.4.2 => 1.56.4.3 ===
--- Products/CMFDefault/Document.py:1.56.4.2	Thu Apr 22 13:47:50 2004
+++ Products/CMFDefault/Document.py	Sun Jul 25 16:12:17 2004
@@ -24,7 +24,9 @@
 from Products.CMFCore.CMFCorePermissions import View
 from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
 from Products.CMFCore.WorkflowCore import WorkflowAction
-from Products.CMFCore.utils import format_stx, keywordsplitter
+from Products.CMFCore.utils import format_stx
+from Products.CMFCore.utils import keywordsplitter
+from Products.CMFCore.utils import contributorsplitter
 from DublinCore import DefaultDublinCoreImpl
 from utils import parseHeadersBody, formatRFC822Headers
 from utils import SimpleHTMLParser, bodyfinder, _dtmldir
@@ -179,9 +181,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.26.4.2 => 1.26.4.3 ===
--- Products/CMFDefault/Link.py:1.26.4.2	Thu Apr 22 13:47:50 2004
+++ Products/CMFDefault/Link.py	Sun Jul 25 16:12:17 2004
@@ -26,6 +26,7 @@
 from Products.CMFCore.PortalContent import ResourceLockedError
 from Products.CMFCore.WorkflowCore import WorkflowAction
 from Products.CMFCore.utils import keywordsplitter
+from Products.CMFCore.utils import contributorsplitter
 
 from DublinCore import DefaultDublinCoreImpl
 from utils import formatRFC822Headers, parseHeadersBody, _dtmldir
@@ -173,9 +174,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'],