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.4 -r1.5
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	19 May 2006 11:23:16 -0000	1.4
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	19 May 2006 21:10:46 -0000	1.5
@@ -259,16 +259,14 @@
   }
   PageInstanceForm instproc new_data {} {
     my instvar data
-    my log "-- 1 $data, cl=[$data info class] [[$data info class] object_type]"
     set item_id [next]
-    my log "-- 2 $data, cl=[$data info class] [[$data info class] object_type]"
     my set_submit_link_edit
     return $item_id
   }
 
   PageInstanceForm instproc edit_data {} {
     set item_id [next]
-    my log "-- edit_data item_id=$item_id"
+    #my log "-- edit_data item_id=$item_id"
     return $item_id
   }
 
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.35 -r1.36
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 May 2006 11:23:16 -0000	1.35
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 May 2006 21:10:46 -0000	1.36
@@ -736,8 +736,10 @@
     set spec ""
     foreach {s widget_spec} [[my set parent_id] get_payload widget_specs] {
       foreach {page_name var_name} [split $s ,] break
+      # in case we have no name (edit new page) we use the first value or the default.
+      set name [expr {[my exists name] ? [my set name] : $page_name}]
       #ns_log notice "--w T.name = '[my set name]' var=$page_name, $var_name $field_name []"
-      if {[string match $page_name [my set name]] &&
+      if {[string match $page_name $name] &&
 	  [string match $var_name $field_name]} {
 	set spec $widget_spec
 	break