Port multiple selection property fix from 2.6 branch. Also undid a previous...

Port multiple selection property fix from 2.6 branch. Also undid a previous fix which prevented multiple select properties from being added TTW.

lib/python/OFS/PropertyManager.py

@@ -12,7 +12,7 @@
 ##############################################################################
 
 """Property management"""
-__version__='$Revision: 1.50 $'[11:-2]
+__version__='$Revision: 1.51 $'[11:-2]
 
 import ExtensionClass, Globals
 import ZDOM
@@ -259,7 +259,10 @@ class PropertyManager(ExtensionClass.Base, ZDOM.ElementWithAttributes):
         for prop in self._propertyMap():
             name=prop['id']
             if 'w' in prop.get('mode', 'wd'):
-                value=REQUEST.get(name, '')
+                if prop['type'] == 'multiple selection':
+                    value=REQUEST.get(name, [])
+                else:
+                    value=REQUEST.get(name, '')
                 self._updateProperty(name, value)
         if REQUEST:
             message="Saved changes."

lib/python/ZPublisher/Converters.py

@@ -10,7 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__version__='$Revision: 1.22 $'[11:-2]
+__version__='$Revision: 1.23 $'[11:-2]
 
 import re
 from types import ListType, TupleType, UnicodeType
@@ -165,7 +165,6 @@ type_converters = {
     'required':           field2required,
     'tokens':             field2tokens,
     'lines':              field2lines,
-    'multiple selection': field2lines,
     'text':               field2text,
     'boolean':            field2boolean,
     'ustring':            field2ustring,