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.33 -r1.34
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	1 Mar 2007 10:25:10 -0000	1.33
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	7 Mar 2007 20:12:41 -0000	1.34
@@ -59,7 +59,13 @@
     my instvar data autoname
     set __fields ""
     set field_list [my field_list]
-    if {[my show_page_order]} {set field_list [linsert $field_list 2 page_order]}
+    if {[my show_page_order]} {
+      set field_list [linsert $field_list 2 page_order]
+      set s [$data get_field_type page_order "" ""]
+      if {$s ne ""} {
+	my set f.page_order $page_order:$s
+      }
+    }
     if {$autoname} {
       my f.name {name:text(hidden),optional}
     }
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.82 -r1.83
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	4 Mar 2007 21:32:40 -0000	1.82
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	7 Mar 2007 20:12:41 -0000	1.83
@@ -803,11 +803,12 @@
     # get the widget field specifications from the payload of the folder object
     # for a field with a specified name in a specified page template
     set spec $default_spec
-    #ns_log notice "--w pid=[my set parent_id] name='$name' template=[$template set name], specs=[[my set parent_id] get_payload widget_specs]"
+    set given_template_name [expr {[my isobject $template] ? [$template set name] : $template}]
+    #ns_log notice "--w pid=[my set parent_id] name='$name' template[$given_template_name, specs=[[my set parent_id] get_payload widget_specs]"
     foreach {s widget} [[my set parent_id] get_payload widget_specs] {
       foreach {template_name var_name} [split $s ,] break
-      #ns_log notice "--w T.title = '[$template set name]' var=$name"
-      if {[string match $template_name [$template set name]] &&
+      #ns_log notice "--w T.title = '$given_template_name' var=$name"
+      if {([string match $template_name $given_template_name] || $given_template_name eq "") &&
           [string match $var_name $name]} {
         set spec $widget
         #ns_log notice "--w using $widget for $name"