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.7 -r1.8
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	16 Jun 2006 16:31:01 -0000	1.7
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	8 Jul 2006 02:47:49 -0000	1.8
@@ -157,7 +157,7 @@
       }
     }
     ### provide a nice link
-    my set submit_link [::xowiki::Page pretty_link \
+    #my set submit_link [::xowiki::Page pretty_link \
 			    -package_id [$data set parent_id] \
 			    [$data set name]]
   }
@@ -249,8 +249,7 @@
   }
 
   ObjectForm instproc edit_data {} {
-    my instvar data
-    $data set_payload [$data set text]
+    [my data] initialize_loaded_object
     next
   }
 
Index: openacs-4/packages/xowiki/www/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/edit.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/xowiki/www/edit.tcl	19 May 2006 22:21:30 -0000	1.13
+++ openacs-4/packages/xowiki/www/edit.tcl	8 Jul 2006 02:47:49 -0000	1.14
@@ -15,6 +15,7 @@
   folder_id:integer,optional
   {object_type:optional ::xowiki::Page}
   page_template:integer,optional
+  return_url:optional
 }
 
 #ns_log notice "-- [ad_conn url]/'[ns_conn query]' \
@@ -55,12 +56,21 @@
 			-community_id [dotlrn_community::get_community_id]]
 }
 
+if {![info exists return_url]} {
+  if {[info exists item_id]  && [ns_set get [ns_getform] __new_p] ne "1"} {
+    set return_url [::xowiki::Page pretty_link -package_id [ad_conn package_id] [$page set name]]
+  } else {
+    set return_url view
+  }
+}
 [$object_type getFormClass] create ::xowiki::f1 -volatile \
     -data $page \
-    -folderspec [expr {$fs_folder_id ne "" ? "folder_id $fs_folder_id" : ""}]
+    -folderspec [expr {$fs_folder_id ne "" ? "folder_id $fs_folder_id" : ""}] \
+    -submit_link $return_url
+
 #ns_log notice "-- form f1 has class [::xowiki::f1 info class]"
 
-::xowiki::f1 generate
+::xowiki::f1 generate -export [list [list return_url $return_url]]
 ::xowiki::f1 instvar edit_form_page_title context formTemplate
 
 if {[info exists item_id]} {