Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.93 -r1.94
--- openacs-4/packages/acs-tcl/acs-tcl.info	23 Oct 2018 08:26:57 -0000	1.93
+++ openacs-4/packages/acs-tcl/acs-tcl.info	30 Jan 2019 13:49:18 -0000	1.94
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d21" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d21.apm">
+    <version name="5.10.0d22" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d22.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The Kernel Tcl API library.</summary>
         <release-date>2017-08-06</release-date>
@@ -18,7 +18,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-tcl" version="5.10.0d21"/>
+        <provides url="acs-tcl" version="5.10.0d22"/>
         <requires url="acs-bootstrap-installer" version="5.10.0d4"/>
         <requires url="acs-kernel" version="5.10.0d0"/>
 
Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.78 -r1.79
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	27 Jul 2018 09:36:20 -0000	1.78
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	30 Jan 2019 13:49:18 -0000	1.79
@@ -530,6 +530,7 @@
 ad_proc -public ad_return_url {
     -urlencode:boolean
     -qualified:boolean
+    {-default_url /}
     {extra_args {}}
 } {
 
@@ -559,29 +560,32 @@
 
     @author Don Baccus (dhogaza@pacifier.com)
 
-    @param urlencode If true url-encode the result
+    @param urlencode If true URL-encode the result
+    @param default_url When there is no connection, fall back to this URL
     @param qualified If provided the return URL will be fully qualified including http or https.
     @param extra_args A list of {name value} lists to append to the query string
 
 } {
 
-    set query_list [export_entire_form_as_url_vars]
-
+    if {[ns_conn isconnected]} {
+        set query_list [export_entire_form_as_url_vars]
+        if { [llength $query_list] == 0 } {
+            set url [ns_conn url]
+        } else {
+            set url "[ns_conn url]?[join $query_list &]"
+        }
+        if { $qualified_p } {
+            # Make the return_url fully qualified
+            set url [security::get_qualified_url $url]
+        }
+    } else {
+        set query_list ""
+        set url $default_url
+    }
     foreach {extra_arg} $extra_args {
         lappend query_list [join $extra_arg "="]
     }
 
-    if { [llength $query_list] == 0 } {
-        set url [ns_conn url]
-    } else {
-        set url "[ns_conn url]?[join $query_list &]"
-    }
-
-    if { $qualified_p } {
-        # Make the return_url fully qualified
-        set url [security::get_qualified_url $url]
-    }
-
     if { $urlencode_p } {
         set url [ns_urlencode $url]
     }
Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.177 -r1.178
--- openacs-4/packages/xowiki/xowiki.info	27 Jan 2019 18:09:50 -0000	1.177
+++ openacs-4/packages/xowiki/xowiki.info	30 Jan 2019 13:49:18 -0000	1.178
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d19" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d19.apm">
+    <version name="5.10.0d20" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d20.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2017-08-06</release-date>
@@ -55,11 +55,11 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d19"/>
+        <provides url="xowiki" version="5.10.0d20"/>
         <requires url="xotcl-core" version="5.10.0d11"/>
 	<requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
-	<requires url="acs-tcl" version="5.10.0d13"/>
+	<requires url="acs-tcl" version="5.10.0d22"/>
 	<requires url="acs-templating" version="5.10.0d5"/>
         <requires url="acs-subsite" version="5.9.1"/>
 	<requires url="richtext-ckeditor4" version="0.16"/>
Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -r1.53 -r1.54
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	30 Jan 2019 11:29:00 -0000	1.53
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	30 Jan 2019 13:49:18 -0000	1.54
@@ -550,12 +550,7 @@
     }
 
     $package_id instvar package_key
-    #set return_url [export_vars -base [::xo::cc url] {orderby}]
-    if {[ns_conn isconnected]} {
-      set return_url [ad_return_url]
-    } else {
-      set return_url [$current_folder pretty_link]
-    }
+    set return_url [ad_return_url -default_url [$current_folder pretty_link]]
     set category_url [export_vars -base [$package_id package_url] { {manage-categories 1} {object_id $package_id}}]
 
     set columns {objects edit object_type name last_modified mod_user delete}