Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v diff -u -r1.46 -r1.47 --- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 8 Jan 2010 17:39:58 -0000 1.46 +++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 8 Apr 2013 15:50:25 -0000 1.47 @@ -367,7 +367,9 @@ @return IANA MIME character set name } { # DRB: cache this now that ad_conn tracks it - return [db_string -cache_key ad_lang_mime_charset_$locale charset_for_locale {}] + set key ::lang::util::charset_for_locale($locale) + if {[info exists $key]} {return [set $key]} + set $key [db_string -cache_key ad_lang_mime_charset_$locale charset_for_locale {}] } ad_proc -private lang::util::default_locale_from_lang_not_cached {