Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -r1.77 -r1.78
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	18 Jul 2007 11:36:28 -0000	1.77
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	18 Jul 2007 13:49:17 -0000	1.78
@@ -635,7 +635,7 @@
     # The widget_spec functionality might be deprecated in the future.
     #
     foreach __var $page_instance_form_atts {
-      set spec [$data widget_spec_from_folder_object [$data set name] [$template set name]]
+      set spec [$data widget_spec_from_folder_object $__var [$template set name]]
       if {$spec ne ""} {
         my set f.$__var "$__var:$spec"
       }
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.146 -r1.147
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	18 Jul 2007 12:29:03 -0000	1.146
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	18 Jul 2007 13:49:17 -0000	1.147
@@ -1082,7 +1082,7 @@
     # get the widget field specifications from the payload of the folder object
     # for a field with a specified name in a specified page template
     my instvar page_template
-    foreach {s widget} [[my set parent_id] get_payload widget_specs] {
+    foreach {s widget_spec} [[my set parent_id] get_payload widget_specs] {
       foreach {template_name var_name} [split $s ,] break
       #ns_log notice "--w T.title = '$given_template_name' var=$name"
       if {([string match $template_name $given_template_name] || $given_template_name eq "") &&