Index: openacs-4/packages/acs-api-browser/www/content-page-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/content-page-view.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-api-browser/www/content-page-view.tcl	24 Jun 2015 19:10:41 -0000	1.8
+++ openacs-4/packages/acs-api-browser/www/content-page-view.tcl	27 Jun 2015 16:57:15 -0000	1.9
@@ -20,7 +20,7 @@
 }
 
 set context [list]
-set url_vars [export_vars -url {path version_id}]
+set url_vars [export_vars {path version_id}]
 set return_url [ns_urlencode [ad_conn url]?][ns_urlencode $url_vars]
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
 
Index: openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl	27 Oct 2014 16:38:59 -0000	1.4
+++ openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl	27 Jun 2015 16:57:15 -0000	1.5
@@ -33,12 +33,14 @@
 switch $type {
     "PACKAGE" {
 	set type "PACKAGE BODY"
-	set package_slider_list [list "package" "<a href=\"[ad_conn url]?[export_vars -url {type name}]\">package body</a>"]
+	set href [export_vars -base [ad_conn url] {type name}]
+	set package_slider_list [list "package" [subst {<a href="[ns_quotehtml $href]">package body</a>}]]
     }
 
     "PACKAGE BODY" {
 	set type "PACKAGE"
-	set package_slider_list [list "<a href=\"[ad_conn url]?[export_vars -url {type name}]\">package</a>" "package body"]
+	set href [export_vars -base [ad_conn url] {type name}]
+	set package_slider_list [list [subst {<a href="[ns_quotehtml $href]">package</a>}] "package body"]
     }
 
     default {
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 -r1.8 -r1.9
--- openacs-4/packages/acs-api-browser/www/proc-view.tcl	14 Jun 2015 00:04:21 -0000	1.8
+++ openacs-4/packages/acs-api-browser/www/proc-view.tcl	27 Jun 2015 16:57:15 -0000	1.9
@@ -33,7 +33,7 @@
 lappend context [list $proc]
 
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
-set return_url [ns_urlencode [ad_conn url]?[export_vars -url {proc version_id}]]
+set return_url [export_vars -base [ad_conn url] {proc version_id}]
 set error_msg ""
 
 if { ![info exists source_p] } {
Index: openacs-4/packages/acs-api-browser/www/procs-file-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/procs-file-view.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-api-browser/www/procs-file-view.tcl	19 Jun 2015 19:49:02 -0000	1.6
+++ openacs-4/packages/acs-api-browser/www/procs-file-view.tcl	27 Jun 2015 16:57:15 -0000	1.7
@@ -16,7 +16,7 @@
     proc_doc_list:multirow
 }
 
-set url_vars [export_vars -url {path version_id}]
+set url_vars [export_vars {path version_id}]
 set return_url [ns_urlencode [ad_conn url]?][ns_urlencode $url_vars]
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
 if { ![info exists source_p] } {