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.55.2.48 -r1.55.2.49
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	29 Jul 2021 15:44:46 -0000	1.55.2.48
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	9 Aug 2021 09:55:57 -0000	1.55.2.49
@@ -337,7 +337,6 @@
       }
       lappend bind_vars nls_language $nls_language
 
-      set return_url [::xo::cc url]
       $mb current_folder ${:current_folder}
       $mb parent_id $opt_parent_id
       #:log "folders: call update_items with config '$config' bind_vars=$bind_vars"
@@ -347,7 +346,7 @@
           -current_page $page \
           -folder_link $folder_link \
           -package_id $package_id \
-          -return_url $return_url
+          -return_url [ad_urlencode_folder_path [::xo::cc url]]
     }
 
     # Start with the "package's folder" as root folder
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.239.2.71 -r1.239.2.72
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	29 Jul 2021 17:27:01 -0000	1.239.2.71
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	9 Aug 2021 09:55:57 -0000	1.239.2.72
@@ -2491,7 +2491,7 @@
              //console.log('have href ' + href + ' c=' + c);
 
              var transaction = YAHOO.util.Connect.asyncRequest('GET', \
-                 href + '?template_file=view-page&return_url=' + href,
+                 href + '?template_file=view-page&return_url=' + encodeURI(href),
                 {
                   success:function(o) {
                      var bookpage = document.getElementById('book-page');
Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v
diff -u -r1.19.2.15 -r1.19.2.16
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl	28 Jun 2021 19:45:37 -0000	1.19.2.15
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl	9 Aug 2021 09:55:57 -0000	1.19.2.16
@@ -351,13 +351,14 @@
       set clipboard_content_link $folder_link?m=clipboard-content
       set clipboard_clear_link   $folder_link?m=clipboard-clear
     }
+    set clipboard_add_link [export_vars -base $folder_link?m=clipboard-add {return_url}]
 
     # TODO: we should check either, whether to user is allowed to
     # copy-to-clipboard from the current folder, and/or the user is
     # allowed to do this with certain items.... (the latter in
     # clipboard-add)
     :add_menu_item -name Clipboard.Add \
-        -item [list url \# listener [list click acs_ListBulkActionMultiFormClick("objects","$folder_link?m=clipboard-add&return_url=$return_url")]]
+        -item [list url \# listener [list click acs_ListBulkActionMultiFormClick("objects","$clipboard_add_link")]]
     :add_menu_item -name Clipboard.Content     -item [list url $clipboard_content_link]
     :add_menu_item -name Clipboard.Clear       -item [list url $clipboard_clear_link]
     :add_menu_item -name Clipboard.Use.Copy    -item [list url $clipboard_copy_link]
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.332.2.87 -r1.332.2.88
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	7 Aug 2021 09:43:42 -0000	1.332.2.87
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Aug 2021 09:55:57 -0000	1.332.2.88
@@ -526,7 +526,7 @@
     Generate a (minimal) link to a wiki page with the specified name.
     Practically all links in the xowiki systems are generated through
     this method. The method returns the URL path urlencoded,
-    unless path_encode is set to false.
+    unless "-path_encode" is set to false.
 
     @param anchor anchor to be added to the link
     @param query query parameters to be added literally to the resulting URL