Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.323 -r1.324
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	27 Apr 2015 17:39:42 -0000	1.323
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	8 Jun 2015 07:48:14 -0000	1.324
@@ -745,6 +745,7 @@
 
     #my show_fields $form_fields
     #my log "__form_action [my form_parameter __form_action {}]"
+    
     if {[my form_parameter __form_action ""] eq "save-form-data"} {
       #my msg "we have to validate"
       #
@@ -958,11 +959,15 @@
     }
 
     if {$formNode ne ""} {
+      
       if {[my exists_query_parameter "return_url"]} {
         set return_url [my query_parameter "return_url"]
+      } else {
+        set return_url [::xo::cc url]
       }
       set m [my form_parameter __form_redirect_method "edit"]
       set url [export_vars -base [my pretty_link] {m return_url}]
+      #my log "setting action <$url> for form-action my-name [my name]"
       $formNode setAttribute action $url method POST role form
       if {$has_file} {$formNode setAttribute enctype multipart/form-data}
       Form add_dom_attribute_value $formNode class [$page_template css_class_name]