diff options
| author | xue <> | 2006-08-02 02:24:29 +0000 |
|---|---|---|
| committer | xue <> | 2006-08-02 02:24:29 +0000 |
| commit | 550ba06593b467b643862d41a00ca2dd12ee704b (patch) | |
| tree | 16ad8180c2f0b96454453effff89dc236469ee4f /framework/I18N/core/MessageFormat.php | |
| parent | ccfa7850dc435ae9941cde18be827b3aac550f85 (diff) | |
merge from 3.0 branch till 1320.
Diffstat (limited to 'framework/I18N/core/MessageFormat.php')
| -rw-r--r-- | framework/I18N/core/MessageFormat.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/I18N/core/MessageFormat.php b/framework/I18N/core/MessageFormat.php index dab7434c..3faa663d 100644 --- a/framework/I18N/core/MessageFormat.php +++ b/framework/I18N/core/MessageFormat.php @@ -161,6 +161,10 @@ class MessageFormat public function format($string,$args=array(), $catalogue=null, $charset=null)
{
if(empty($charset)) $charset = $this->getCharset();
+
+ //force args as UTF-8
+ foreach($args as $k => $v)
+ $args[$k] = I18N_toUTF8($v, $charset);
$s = $this->formatString(I18N_toUTF8($string, $charset),$args,$catalogue);
return I18N_toEncoding($s, $charset);
}
|