Index: openacs-4/packages/acs-lang/lib/change-locale-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/change-locale-bar.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/lib/change-locale-bar.tcl	8 Jun 2004 17:06:42 -0000	1.4
+++ openacs-4/packages/acs-lang/lib/change-locale-bar.tcl	27 Oct 2014 16:39:37 -0000	1.5
@@ -6,16 +6,16 @@
 set current_locale [lang::conn::locale]
 set base_lang_url [site_node::get_package_url -package_key acs-lang]
 
-if { ![exists_and_not_null return_url]} {
+if { (![info exists return_url] || $return_url eq "")} {
     # Use referer header
     set return_url [ad_return_url]
 }
 
-if { ![exists_and_not_null max_locales]} {
+if { (![info exists max_locales] || $max_locales eq "")} {
     set max_locales 8
 }
 
-if { ![exists_and_not_null avail_key] } {
+if { (![info exists avail_key] || $avail_key eq "") } {
     set avail_key "this-language"
 }