Index: openacs-4/packages/forums/www/forum-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v
diff -u -N -r1.38.2.6 -r1.38.2.7
--- openacs-4/packages/forums/www/forum-view.tcl	30 Aug 2022 13:08:29 -0000	1.38.2.6
+++ openacs-4/packages/forums/www/forum-view.tcl	8 Nov 2022 14:19:45 -0000	1.38.2.7
@@ -28,7 +28,8 @@
 forum::security::require_read_forum -forum_id $forum_id
 forum::security::permissions -forum_id $forum_id -- permissions
 
-set admin_url [export_vars -base "admin/forum-edit" { forum_id {return_url [ad_return_url]}}]
+set return_url [ad_return_url]
+set admin_url [export_vars -base "admin/forum-edit" { forum_id return_url }]
 set moderate_url [export_vars -base "moderate/forum" { forum_id }]
 set post_url [export_vars -base "message-post" { forum_id }]
 
Index: openacs-4/packages/acs-api-browser/www/proc-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-view.tcl,v
diff -u -N -r1.16.2.6 -r1.16.2.7
--- openacs-4/packages/acs-api-browser/www/proc-view.tcl	27 Oct 2022 10:58:22 -0000	1.16.2.6
+++ openacs-4/packages/acs-api-browser/www/proc-view.tcl	8 Nov 2022 14:25:27 -0000	1.16.2.7
@@ -151,7 +151,8 @@
         set documentation [api_proc_documentation -script $proc_index]
     }
 }
-set procViewToggleURL [export_vars -base proc-view -no_empty {proc {source_p "[expr {!$source_p}]"} version_id}]
+set toggle_source_p [expr {!$source_p}]
+set procViewToggleURL [export_vars -base proc-view -no_empty {proc {source_p $toggle_source_p} version_id}]
 set setDefaultURL     [export_vars -base set-default {source_p return_url}]
 
 #