Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	19 Jun 2015 17:58:53 -0000	1.16
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	27 Jun 2015 16:23:12 -0000	1.17
@@ -114,16 +114,16 @@
     delete_url
     message_key_pretty
 } messages select_messages {} {
-    set edit_url "edit-localized-message?[export_vars { locale package_key message_key show {return_url {[ad_return_url]}} }]"
-    set delete_url "message-delete?[export_vars { locale package_key message_key show {return_url {[ad_return_url]}} }]"
+    set edit_url [export_vars -base { locale package_key message_key show {return_url [ad_return_url]} }]
+    set delete_url [export_vars -base message-delete { locale package_key message_key show {return_url [ad_return_url]} }]
     set message_key_pretty "$package_key.$message_key"
 }
 
 # TODO: PG
 # TODO: Create message
 
 
-set batch_edit_url "batch-editor?[export_vars { locale package_key show }]"
+set batch_edit_url [export_vars -base batch-editor { locale package_key show }]
 
 
 #####
@@ -144,9 +144,9 @@
 multirow foreach show_opts {
     set selected_p [string equal $show $value]
     if {$value eq "all"} {
-        set url "[ad_conn url]?[export_vars { locale package_key }]"
+        set url [export_vars -base [ad_conn url] { locale package_key }]
     } else { 
-        set url "[ad_conn url]?[export_vars { locale package_key {show $value} }]"
+        set url [export_vars -base [ad_conn url] { locale package_key {show $value} }]
     }
 }