Index: openacs-4/packages/acs-admin/www/send-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/send-email.tcl,v
diff -u -r1.6.2.3 -r1.6.2.4
--- openacs-4/packages/acs-admin/www/send-email.tcl	20 May 2016 18:05:12 -0000	1.6.2.3
+++ openacs-4/packages/acs-admin/www/send-email.tcl	20 May 2016 19:52:59 -0000	1.6.2.4
@@ -9,7 +9,7 @@
     email_from
     subject
     message
-    return_url:return_url
+    return_url:localurl
     {show_sent_message_p:boolean "f"}
     {sent_title "Email sent"}
     {sent_subject "Email sent"}
Index: openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl,v
diff -u -r1.5.24.2 -r1.5.24.3
--- openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl	20 May 2016 18:05:12 -0000	1.5.24.2
+++ openacs-4/packages/acs-admin/www/apm/file-watch-cancel.tcl	20 May 2016 19:52:59 -0000	1.5.24.3
@@ -8,7 +8,7 @@
     @cvs-id $Id$
 } {
     {watch_file ""}
-    {return_url:return_url ""}
+    {return_url:localurl ""}
 }
 apm_file_watch_cancel $watch_file
 
Index: openacs-4/packages/acs-admin/www/apm/file-watch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/file-watch.tcl,v
diff -u -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-admin/www/apm/file-watch.tcl	20 May 2016 18:05:12 -0000	1.12.2.2
+++ openacs-4/packages/acs-admin/www/apm/file-watch.tcl	20 May 2016 19:52:59 -0000	1.12.2.3
@@ -9,7 +9,7 @@
 } {
     version_id:naturalnum,notnull
     paths:multiple
-    {return_url:return_url ""}
+    {return_url:localurl ""}
 } 
 
 set package_key [apm_package_key_from_version_id $version_id]
Index: openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl	20 May 2016 18:05:12 -0000	1.2.2.2
+++ openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl	20 May 2016 19:52:59 -0000	1.2.2.3
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 } {
     {package_key:notnull}
-    {return_url:return_url /acs/admin/apm}
+    {return_url:localurl /acs/admin/apm}
 }
 apm_package_instance_new -package_key $package_key
 ad_returnredirect $return_url
Index: openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl,v
diff -u -r1.1.24.2 -r1.1.24.3
--- openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl	20 May 2016 18:05:12 -0000	1.1.24.2
+++ openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl	20 May 2016 19:52:59 -0000	1.1.24.3
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 } {
     package_key
-    {return_url:return_url "index"}
+    {return_url:localurl "index"}
 } 
 
 apm_cancel_all_watches $package_key
Index: openacs-4/packages/acs-admin/www/apm/package-watch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-watch.tcl,v
diff -u -r1.2.24.2 -r1.2.24.3
--- openacs-4/packages/acs-admin/www/apm/package-watch.tcl	20 May 2016 18:05:12 -0000	1.2.24.2
+++ openacs-4/packages/acs-admin/www/apm/package-watch.tcl	20 May 2016 19:52:59 -0000	1.2.24.3
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     package_key
-    {return_url:return_url "index"}
+    {return_url:localurl "index"}
 } 
 
 apm_watch_all_files $package_key
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl	20 May 2016 18:05:12 -0000	1.8.2.2
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl	20 May 2016 19:52:59 -0000	1.8.2.3
@@ -6,7 +6,7 @@
     @cvs-id $Id$  
 } {
     version_id:naturalnum,notnull
-    {return_url:return_url {[export_vars -base "version-i18n-index" { version_id }]}}
+    {return_url:localurl {[export_vars -base "version-i18n-index" { version_id }]}}
 }
 
 db_1row package_version_info { 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl	20 May 2016 18:05:12 -0000	1.5.2.2
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl	20 May 2016 19:52:59 -0000	1.5.2.3
@@ -6,7 +6,7 @@
     @cvs-id $Id$  
 } {
     version_id:naturalnum,notnull    
-    {return_url:return_url {[export_vars -base "version-i18n-index" { version_id }]}}
+    {return_url:localurl {[export_vars -base "version-i18n-index" { version_id }]}}
 }
 
 db_1row package_version_info { 
Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	20 May 2016 18:05:12 -0000	1.11.2.2
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	20 May 2016 19:52:59 -0000	1.11.2.3
@@ -7,7 +7,7 @@
     @cvs-id $Id$
 } {
     {version_id:naturalnum,notnull}
-    {return_url:return_url "index"}
+    {return_url:localurl "index"}
 }
 
 apm_version_info $version_id
Index: openacs-4/packages/acs-admin/www/cache/flush-cache.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/cache/flush-cache.tcl,v
diff -u -r1.3.12.2 -r1.3.12.3
--- openacs-4/packages/acs-admin/www/cache/flush-cache.tcl	20 May 2016 18:05:12 -0000	1.3.12.2
+++ openacs-4/packages/acs-admin/www/cache/flush-cache.tcl	20 May 2016 19:52:59 -0000	1.3.12.3
@@ -2,7 +2,7 @@
     Flush one or more values from util_memoize's cache
 } {
     suffix
-    {return_url:return_url "."}
+    {return_url:localurl "."}
 }
 
 if {$suffix eq "util_memoize"} {   
Index: openacs-4/packages/acs-admin/www/cache/flush.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/cache/flush.tcl,v
diff -u -r1.3.12.3 -r1.3.12.4
--- openacs-4/packages/acs-admin/www/cache/flush.tcl	20 May 2016 18:05:12 -0000	1.3.12.3
+++ openacs-4/packages/acs-admin/www/cache/flush.tcl	20 May 2016 19:52:59 -0000	1.3.12.4
@@ -5,7 +5,7 @@
     pattern
     raw_date
     key:allhtml
-    {return_url:return_url "show-util-memoize?pattern=$pattern"}
+    {return_url:localurl "show-util-memoize?pattern=$pattern"}
 }
 
 if {[catch {set pair [ns_cache get util_memoize $key]} errmsg]} {
Index: openacs-4/packages/acs-admin/www/users/delete-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/delete-user.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-admin/www/users/delete-user.tcl	20 May 2016 18:05:12 -0000	1.2.2.2
+++ openacs-4/packages/acs-admin/www/users/delete-user.tcl	20 May 2016 19:52:59 -0000	1.2.2.3
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
   user_id:naturalnum,notnull
-  {return_url:return_url .}
+  {return_url:localurl .}
   {permanent:boolean f}
 }
 
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.17.2.3 -r1.17.2.4
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	20 May 2016 18:05:12 -0000	1.17.2.3
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	20 May 2016 19:52:59 -0000	1.17.2.4
@@ -10,7 +10,7 @@
     user_id:naturalnum,notnull
     {member_state "no_change"}
     {email_verified_p:boolean "no_change"}
-    {return_url:return_url ""}
+    {return_url:localurl ""}
 } -properties {
     context:onevalue
     export_vars:onevalue
Index: openacs-4/packages/acs-admin/www/users/password-reset.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/password-reset.tcl,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/acs-admin/www/users/password-reset.tcl	20 May 2016 18:05:12 -0000	1.3.2.2
+++ openacs-4/packages/acs-admin/www/users/password-reset.tcl	20 May 2016 19:52:59 -0000	1.3.2.3
@@ -2,7 +2,7 @@
     Reset a user's password.
 } {
     user_id:naturalnum,notnull
-    {return_url:return_url .}
+    {return_url:localurl .}
 }
 
 acs_user::get -user_id $user_id -array user_info
Index: openacs-4/packages/acs-admin/www/users/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/password-update.tcl,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-admin/www/users/password-update.tcl	20 May 2016 18:05:12 -0000	1.4.2.2
+++ openacs-4/packages/acs-admin/www/users/password-update.tcl	20 May 2016 19:52:59 -0000	1.4.2.3
@@ -4,7 +4,7 @@
     @version $Id$
 } {
     {user_id:naturalnum,notnull}
-    {return_url:return_url ""}
+    {return_url:localurl ""}
     {password_old ""}
 }
 
Index: openacs-4/packages/acs-api-browser/www/set-default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/set-default.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-api-browser/www/set-default.tcl	19 May 2016 08:43:01 -0000	1.2.2.2
+++ openacs-4/packages/acs-api-browser/www/set-default.tcl	20 May 2016 19:52:59 -0000	1.2.2.3
@@ -2,7 +2,7 @@
     Set user preferences for API browsing.
 } {
     source_p:boolean,optional,notnull
-    return_url:return_url
+    return_url:localurl
 }
 
 set found_p 0
Index: openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl,v
diff -u -r1.1.26.2 -r1.1.26.3
--- openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl	20 May 2016 18:33:05 -0000	1.1.26.2
+++ openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl	20 May 2016 19:52:59 -0000	1.1.26.3
@@ -7,7 +7,7 @@
   @cvs-id $Id$
 } {
     absolute_file_path
-    return_url:return_url
+    return_url:localurl
 }
 
 ns_log Notice "Sourcing test definition file $absolute_file_path"
Index: openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl,v
diff -u -r1.2.12.2 -r1.2.12.3
--- openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl	20 May 2016 18:33:05 -0000	1.2.12.2
+++ openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl	20 May 2016 19:52:59 -0000	1.2.12.3
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 } {
     package_key
-    {return_url:return_url ""}
+    {return_url:localurl ""}
 } -properties {
 } -validate {
 } -errors {