Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	7 Aug 2014 07:36:54 -0000	1.12
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	27 Jun 2015 17:39:23 -0000	1.13
@@ -57,7 +57,7 @@
 # If the user opts to create a new folder we need to provide this url
 # along with the whole url vars string to enable the user to come back
 # (also needed if the user needs to log in to the system first)
-set this_url_urlenc [ad_urlencode "[ad_conn url]?[export_vars -url {viewed_user_id complete_url local_title return_url bookmark_id}]"]
+set this_url_urlenc [ad_urlencode [export_vars -base [ad_conn url] -url {viewed_user_id complete_url local_title return_url bookmark_id}]]
 
 # Redirect the user to log in if he has not done so
 set user_id [ad_conn user_id]
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	7 Aug 2014 07:36:54 -0000	1.11
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	27 Jun 2015 17:39:23 -0000	1.12
@@ -105,7 +105,7 @@
 }
 
 # Redirect the user to log in if he has not done so
-set this_url_urlenc [ad_urlencode "[ad_conn url]?[export_vars -url {viewed_user_id complete_url local_title return_url bookmark_id}]"]
+set this_url_urlenc [ad_urlencode [export_vars -base [ad_conn url] -url {viewed_user_id complete_url local_title return_url bookmark_id}]]
 
 set user_id [ad_conn user_id]
 if { $user_id == 0 } {
@@ -127,7 +127,7 @@
 # If the user provided a title and the url is reachable we do not
 # ask for a confirmation
 if { $url_unreachable_p == "f" && $user_provided_title_p == "t"} {
-    ad_returnredirect "bookmark-add-one-2?[export_vars -url {return_url local_title complete_url bookmark_id meta_description meta_keywords url_title viewed_user_id parent_id}]"
+    ad_returnredirect [export_vars -base bookmark-add-one-2 {return_url local_title complete_url bookmark_id meta_description meta_keywords url_title viewed_user_id parent_id}]
     ad_script_abort
 } 
 
Index: openacs-4/packages/bookmarks/www/bookmark-header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-header.tcl	7 Aug 2014 07:36:54 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-header.tcl	27 Jun 2015 17:39:23 -0000	1.8
@@ -51,7 +51,7 @@
 # When we are adding a bookmark we need to know which url to return to
 # A bookmark can also be added via a Bookmarklet in which case return url
 # will be the page that the user is browsing.
-set return_url_urlenc [ad_urlencode [ad_conn url]?[export_vars -url {viewed_user_id}]]
+set return_url_urlenc [ad_urlencode [export_vars -base [ad_conn url] {viewed_user_id}]]
 
 set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""]
 
Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/bookmarks/www/bookmarks-import.tcl	7 Aug 2014 07:36:54 -0000	1.12
+++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl	27 Jun 2015 17:39:23 -0000	1.13
@@ -67,7 +67,7 @@
 
 set page_title "Import Statistics"
 
-set context [bm_context_bar_args [list [list "bookmark-add-import?[export_vars -url {viewed_user_id return_url}]" "Add/Import Bookmarks"] $page_title] $viewed_user_id]
+set context [bm_context_bar_args [list [list [export_vars -base bookmark-add-import {viewed_user_id return_url}] "Add/Import Bookmarks"] $page_title] $viewed_user_id]
 
 
 # set flags to be used parsing the input file.
Index: openacs-4/packages/bookmarks/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/bookmarks/www/index.tcl	27 Jun 2015 12:32:47 -0000	1.14
+++ openacs-4/packages/bookmarks/www/index.tcl	27 Jun 2015 17:39:23 -0000	1.15
@@ -68,7 +68,7 @@
 # When we are adding a bookmark we need to know which url to return to
 # A bookmark can also be added via a Bookmarklet in which case return url
 # will be the page that the user is browsing.
-set return_url_urlenc [ad_urlencode [ad_conn url]?[export_vars -url {viewed_user_id}]]
+set return_url_urlenc [ad_urlencode [export_vars -base [ad_conn url] {viewed_user_id}]]
 
 set user_name [db_string user_name {select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id} \
 		   -bind "viewed_user_id $viewed_user_id" -default ""]