Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/map.tcl,v
diff -u -N -r1.1.6.2 -r1.1.6.3
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/map.tcl	20 May 2016 18:35:40 -0000	1.1.6.2
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/map.tcl	20 May 2016 19:55:32 -0000	1.1.6.3
@@ -6,7 +6,7 @@
 
 } {
     mime_type:notnull
-    {return_url:return_url ""}
+    {return_url:localurl ""}
 }
 
 set doc(title) "Add an extension"
Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/new.tcl,v
diff -u -N -r1.1.6.2 -r1.1.6.3
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/new.tcl	20 May 2016 18:35:40 -0000	1.1.6.2
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/new.tcl	20 May 2016 19:55:32 -0000	1.1.6.3
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 
 } {
-    {return_url:return_url ""}
+    {return_url:localurl ""}
 }
 
 set doc(title) "Create a new MIME Type"
Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl,v
diff -u -N -r1.1.6.2 -r1.1.6.3
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl	20 May 2016 18:35:40 -0000	1.1.6.2
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl	20 May 2016 19:55:32 -0000	1.1.6.3
@@ -7,7 +7,7 @@
 } {
     extension:notnull
     mime_type:notnull
-    {return_url:return_url ""}
+    {return_url:localurl ""}
 }
 
 if { $return_url eq "" } {
Index: openacs-4/packages/acs-developer-support/www/css-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-edit.tcl,v
diff -u -N -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/acs-developer-support/www/css-edit.tcl	20 May 2016 18:37:36 -0000	1.4.2.3
+++ openacs-4/packages/acs-developer-support/www/css-edit.tcl	20 May 2016 19:55:32 -0000	1.4.2.4
@@ -8,7 +8,7 @@
 } {
     {file_location}
     {css_location}
-    {return_url:return_url "/"}
+    {return_url:localurl "/"}
 } -properties {
 } -validate {
 } -errors {
Index: openacs-4/packages/acs-developer-support/www/css-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-list.tcl,v
diff -u -N -r1.2.4.2 -r1.2.4.3
--- openacs-4/packages/acs-developer-support/www/css-list.tcl	20 May 2016 18:37:36 -0000	1.2.4.2
+++ openacs-4/packages/acs-developer-support/www/css-list.tcl	20 May 2016 19:55:32 -0000	1.2.4.3
@@ -8,7 +8,7 @@
     @creation-date 2007-09-29
     @cvs-id $Id$
 } {
-    {return_url:return_url ""}
+    {return_url:localurl ""}
     {css_list}
 } -properties {
 } -validate {
Index: openacs-4/packages/acs-developer-support/www/set-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/set-user.tcl,v
diff -u -N -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-developer-support/www/set-user.tcl	20 May 2016 18:37:36 -0000	1.2.2.2
+++ openacs-4/packages/acs-developer-support/www/set-user.tcl	20 May 2016 19:55:32 -0000	1.2.2.3
@@ -2,7 +2,7 @@
     A hack that will allow us to simulate being a different user
 } {
     user_id:naturalnum,notnull
-    return_url:return_url
+    return_url:localurl
 }
 
 ##NOTE THIS DOESN'T REQUIRE ADMIN SO THAT WE CAN DO USER SWITCHING
Index: openacs-4/packages/acs-developer-support/www/set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/set.tcl,v
diff -u -N -r1.3.2.3 -r1.3.2.4
--- openacs-4/packages/acs-developer-support/www/set.tcl	20 May 2016 18:37:36 -0000	1.3.2.3
+++ openacs-4/packages/acs-developer-support/www/set.tcl	20 May 2016 19:55:32 -0000	1.3.2.4
@@ -8,7 +8,7 @@
 } {
     field 
     enabled_p:boolean
-    {return_url:return_url "."}
+    {return_url:localurl "."}
 }
 
 ds_require_permission [ad_conn package_id] "admin"
Index: openacs-4/packages/acs-lang/www/change-locale.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale.tcl,v
diff -u -N -r1.3.10.2 -r1.3.10.3
--- openacs-4/packages/acs-lang/www/change-locale.tcl	20 May 2016 18:41:40 -0000	1.3.10.2
+++ openacs-4/packages/acs-lang/www/change-locale.tcl	20 May 2016 19:55:32 -0000	1.3.10.3
@@ -2,7 +2,7 @@
 
 } {
     user_locale
-    return_url:return_url
+    return_url:localurl
 }
 
 if { [catch {lang::user::set_locale $user_locale} errmsg] } {
Index: openacs-4/packages/acs-lang/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.tcl,v
diff -u -N -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/acs-lang/www/index.tcl	20 May 2016 18:41:40 -0000	1.6.2.2
+++ openacs-4/packages/acs-lang/www/index.tcl	20 May 2016 19:55:32 -0000	1.6.2.3
@@ -1,7 +1,7 @@
 ad_page_contract {
     Localization home
 } {
-    {return_url:return_url ""}
+    {return_url:localurl ""}
     {return_p:boolean "f"}
 }
 
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -N -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	20 May 2016 18:41:40 -0000	1.20.2.2
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	20 May 2016 19:55:32 -0000	1.20.2.3
@@ -14,7 +14,7 @@
     message_key
     show:optional
     {usage_p:boolean "f"}
-    {return_url:return_url {}}
+    {return_url:localurl {}}
 }
 
 if { [string length $locale] == 2 } {
Index: openacs-4/packages/acs-lang/www/admin/export-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.tcl,v
diff -u -N -r1.2.22.2 -r1.2.22.3
--- openacs-4/packages/acs-lang/www/admin/export-messages.tcl	20 May 2016 18:41:40 -0000	1.2.22.2
+++ openacs-4/packages/acs-lang/www/admin/export-messages.tcl	20 May 2016 19:55:32 -0000	1.2.22.3
@@ -5,7 +5,7 @@
 } {
     {locale:multiple ""}
     {package_key ""}
-    {return_url:return_url "/acs-lang/admin"}
+    {return_url:localurl "/acs-lang/admin"}
 }
 
 set page_title "Export messages"
Index: openacs-4/packages/acs-lang/www/admin/import-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.tcl,v
diff -u -N -r1.7.10.2 -r1.7.10.3
--- openacs-4/packages/acs-lang/www/admin/import-messages.tcl	20 May 2016 18:41:40 -0000	1.7.10.2
+++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl	20 May 2016 19:55:32 -0000	1.7.10.3
@@ -5,7 +5,7 @@
 } {
     {locale ""}
     {package_key ""}
-    {return_url:return_url "/acs-lang/admin"}
+    {return_url:localurl "/acs-lang/admin"}
 }
 
 set page_title "Import messages"
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl,v
diff -u -N -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	20 May 2016 18:41:40 -0000	1.12.2.2
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	20 May 2016 19:55:32 -0000	1.12.2.3
@@ -12,7 +12,7 @@
     locale
     package_key
     {message_key ""}
-    {return_url:return_url {[export_vars -base message-list { locale package_key }]}}
+    {return_url:localurl {[export_vars -base message-list { locale package_key }]}}
 }
 
 
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl,v
diff -u -N -r1.2.22.2 -r1.2.22.3
--- openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	20 May 2016 18:41:40 -0000	1.2.22.2
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	20 May 2016 19:55:32 -0000	1.2.22.3
@@ -7,7 +7,7 @@
     package_key
     message_key
     locale
-    {return_url:return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
+    {return_url:localurl {[export_vars -base "message-conflicts" { package_key locale }]}}
 }
 
 lang::message::edit $package_key $message_key $locale [list conflict_p f]
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl,v
diff -u -N -r1.2.22.2 -r1.2.22.3
--- openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	20 May 2016 18:41:40 -0000	1.2.22.2
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	20 May 2016 19:55:32 -0000	1.2.22.3
@@ -8,7 +8,7 @@
     package_key
     message_key
     locale
-    {return_url:return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
+    {return_url:localurl {[export_vars -base "message-conflicts" { package_key locale }]}}
 }
 
 db_transaction {
Index: openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl,v
diff -u -N -r1.2.12.2 -r1.2.12.3
--- openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl	20 May 2016 18:41:40 -0000	1.2.12.2
+++ openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl	20 May 2016 19:55:32 -0000	1.2.12.3
@@ -5,7 +5,7 @@
     @creation-date October 24, 2002
     @cvs-id $Id$
 } {
-    {return_url:return_url "."}
+    {return_url:localurl "."}
 }
 
 lang::util::translator_mode_set [expr {![lang::util::translator_mode_p]}] 
Index: openacs-4/packages/acs-mail-lite/www/restore-bounce.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/www/restore-bounce.tcl,v
diff -u -N -r1.1.12.2 -r1.1.12.3
--- openacs-4/packages/acs-mail-lite/www/restore-bounce.tcl	20 May 2016 18:44:37 -0000	1.1.12.2
+++ openacs-4/packages/acs-mail-lite/www/restore-bounce.tcl	20 May 2016 19:55:32 -0000	1.1.12.3
@@ -2,7 +2,7 @@
     The page restores a user from the deleted state.
     @cvs-id $Id$
 } {
-    {return_url:return_url {[ad_pvt_home]}}
+    {return_url:localurl {[ad_pvt_home]}}
 }
 
 set page_title [_ acs-mail-lite.Restore_bounce]