more bug fixes

docs/changelog/6.x.x.txt

@@ -14,6 +14,7 @@
  - fix [ 1165425 ] View Userprofile - Style is missing for non-public profiles
  - fix [ 1165434 ] View Userprofile - Perm. denied page not parsed for macros
  - fix [ 1138654 ] 6.3 CVS - raw form parameter not processed
+ - fix [ 1164202 ] Data Form field types are not sticky when re-edited
  - fix [ 1149529 ] 6.3 CVS: Content positions don't save and  
        [ 1149801 ] page position not maintained (Martin Kamerbeek)
 

lib/WebGUI/Asset/Wobject/DataForm.pm

@@ -707,12 +707,12 @@ sub www_editField {
 		-name=>"status",
 		-options=>\%fieldStatus,
 		-label=>WebGUI::International::get(22,"DataForm"),
-		-value=>[ $field{status} || "editable" ]
+		-value=>[ $field{status} ] || [ "editable" ]
 		); 
 	$f->fieldType(
 		-name=>"type",
 		-label=>WebGUI::International::get(23,"DataForm"),
-		-value=>[$field{type} || "text"]
+		-value=>$field{type} || "text"
 		);
 	$f->integer(
 		-name=>"width",