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.8 -r1.9
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	8 Jul 2006 02:47:49 -0000	1.8
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	8 Jul 2006 11:52:17 -0000	1.9
@@ -269,14 +269,16 @@
       }
   PageInstanceForm instproc set_submit_link_edit {} {
     my instvar folder_id data
-    set __vars {folder_id item_id page_template}
     set object_type [[$data info class] object_type]
-    my log "-- data=$data cl=[$data info class] ot=$object_type"
+    #my log "-- data=$data cl=[$data info class] ot=$object_type"
     set item_id [$data set item_id]
     set page_template [ns_set get [ns_getform] page_template]
-    my submit_link [export_vars -base edit {folder_id object_type item_id page_template}]
+    set f [ns_getform]
+    if {[ns_set find $f return_url]} {set return_url [ns_set get $f return_url]}
+    my submit_link [export_vars -base edit {folder_id object_type item_id page_template return_url}]
     my log "-- submit_link = [my submit_link]"
   }
+
   PageInstanceForm instproc new_data {} {
     my instvar data
     set item_id [next]
@@ -301,9 +303,9 @@
       }
 
   PageInstanceEditForm instproc new_data {} {
-    set __vars {folder_id item_id page_template}
+    set __vars {folder_id item_id page_template return_url}
     set object_type [[[my set data] info class] object_type]
-    my log "-- cl=[[my set data] info class] ot=$object_type"
+    #my log "-- cl=[[my set data] info class] ot=$object_type $__vars"
     foreach __v $__vars {set $__v [ns_queryget $__v]}
     set item_id [next]
     my submit_link [export_vars -base edit $__vars]