Merged in fix to 1308 from 2.2 branch

lib/python/OFS/properties.dtml

@@ -67,9 +67,9 @@ values and click "Save Changes".
   "getProperty(id)"><dtml-var sequence-item html_quote><dtml-if
    sequence-end><dtml-else><dtml-var "'\n'"></dtml-if></dtml-in></textarea>
   <dtml-elif "type=='selection'">
-    <dtml-if "_.has_key(select_variable)">
+    <dtml-if "hasProperty(select_variable)">
     <select name="<dtml-var id>">
-      <dtml-in "_[select_variable]">
+      <dtml-in "getProperty(select_variable)">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
           ><dtml-var sequence-item html_quote></option>
@@ -79,10 +79,10 @@ values and click "Save Changes".
        No value for <dtml-var select_variable>.
     </dtml-if>
   <dtml-elif "type=='multiple selection'">
-    <dtml-if "_.has_key(select_variable)">
+    <dtml-if "hasProperty(select_variable)">
     <select name="<dtml-var id>:list" multiple
-      size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
-      <dtml-in "_[select_variable]">
+      size="<dtml-var "_.min(7, _.len(getProperty(select_variable)))">">
+      <dtml-in "getProperty(select_variable)">
          <option<dtml-if 
          "getProperty(id) and (_['sequence-item'] in getProperty(id))"> SELECTED</dtml-if
          >><dtml-var sequence-item html_quote></option>