holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed typo in iconv-call and detection of the right lib to use

Browse Source
This commit is contained in:
Carsten Wolff 2004-02-26 10:57:57 +00:00
parent 8a71c08150
commit f11dd0e255
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/inc/class.translation_sql.inc.php
View File

@ -250,6 +250,16 @@
} }
return $ret; return $ret;
} }
if ($from)
{
$from = strtolower($from);
}
if ($to)
{
$to = strtolower($to);
}
if (!$from) if (!$from)
{ {
$from = $this->mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1'; $from = $this->mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
@ -260,7 +270,7 @@
php does not seem to support gb2312 php does not seem to support gb2312
but seems to be able to decode it as EUC-CN but seems to be able to decode it as EUC-CN
*/ */
switch(strtolower($from)) switch($from)
{ {
case 'gb2312': case 'gb2312':
case 'gb18030': case 'gb18030':
@ -293,7 +303,7 @@
} }
if(function_exists('iconv')) if(function_exists('iconv'))
{ {
if (($data = iconv($from,$to,$date))) if (($data = iconv($from,$to,$data)))
{ {
return $data; return $data;
} }