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]