diff options
| author | fukachan <fukachan> | 2004-02-26 08:07:00 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-02-26 08:07:00 +0000 |
| commit | 5b90a088f34dfa501620c85331cac335c08e33e0 (patch) | |
| tree | 224fce0409f910b43e44ff208ef519dc9c302157 | |
| parent | 4ffe02f1096fb43a47ecd3243238b12650ab1dca (diff) | |
| download | fml8-5b90a088f34dfa501620c85331cac335c08e33e0.tar.gz fml8-5b90a088f34dfa501620c85331cac335c08e33e0.tar.bz2 fml8-5b90a088f34dfa501620c85331cac335c08e33e0.zip | |
get_charset: fix default charset handling
| -rw-r--r-- | fml/lib/FML/Process/Utils.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm index 81cd0e63..f2f9f835 100644 --- a/fml/lib/FML/Process/Utils.pm +++ b/fml/lib/FML/Process/Utils.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Utils.pm,v 1.103 2004/01/24 15:37:03 fukachan Exp $ +# $FML: Utils.pm,v 1.104 2004/02/15 04:38:34 fukachan Exp $ # package FML::Process::Utils; @@ -1523,7 +1523,9 @@ sub set_charset } -# Descriptions: get the current charset. +# Descriptions: get the current charset defined by fml8 in this context. +# This value is NOT one speculated by Content-Type: et.al. +# but use information of Accept-Language field if could. # The default value is given by $template_file_charset. # Arguments: OBJ($curproc) STR($category) # Side Effects: none @@ -1566,6 +1568,7 @@ sub get_charset } } + $charset ||= $default; $curproc->log("debug: category=$category charset=$charset"); return $charset; } |