Index: openacs-4/packages/acs-lang/www/change-locale-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale-include.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-lang/www/change-locale-include.tcl	25 Sep 2007 15:22:36 -0000	1.16
+++ openacs-4/packages/acs-lang/www/change-locale-include.tcl	27 Oct 2014 16:39:38 -0000	1.17
@@ -4,12 +4,12 @@
 #    @author Peter Marklund (peter@collaboraid.biz)
 #    @author Christian Hvid
 
-if { ![exists_and_not_null return_url] } {
+if { (![info exists return_url] || $return_url eq "") } {
     # Use referer header
     set return_url [ns_set iget [ns_conn headers] referer]
 }
 
-if { ![exists_and_not_null package_id] } {
+if { (![info exists package_id] || $package_id eq "") } {
     set package_id [ad_conn package_id]
 }