Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/edit-this-page/www/etp-edit.tcl	3 Oct 2013 09:15:25 -0000	1.16
+++ openacs-4/packages/edit-this-page/www/etp-edit.tcl	27 Jun 2015 20:03:21 -0000	1.17
@@ -166,14 +166,14 @@
 	db_dml update_package_instance_name ""
     }
 
-    ad_returnredirect "etp?[export_vars -url {name}]"
+    ad_returnredirect [export_vars -base etp {name}]
     ad_script_abort
 }
 
 set page_title [_ edit-this-page.atribute_for_page_title]
 
 if {$name eq "index"} {
-    set context [list [list "etp?[export_vars -url {name}]" Edit] $attribute_title]
+    set context [list [list [export_vars -base etp {name}] Edit] $attribute_title]
 } else {
-    set context [list [list $name $name] [list "etp?[export_vars -url {name}]" Edit] $attribute_title]
+    set context [list [list $name $name] [list [export_vars -base etp {name}] Edit] $attribute_title]
 }