forked from extern/egroupware
added check if function iconv exists
This commit is contained in:
parent
e2eb4e721f
commit
43ec195c6e
@ -272,11 +272,17 @@
|
||||
{
|
||||
return mb_convert_encoding($data,$to,$from);
|
||||
}
|
||||
if (($data = iconv($from,$to,$date)))
|
||||
if(function_exists('iconv'))
|
||||
{
|
||||
return $data;
|
||||
if (($data = iconv($from,$to,$date)))
|
||||
{
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
die("<p>Can't convert from charset '$from' to '$to' without the <b>mbstring extension</b> !!!</p>");
|
||||
#die("<p>Can't convert from charset '$from' to '$to' without the <b>mbstring extension</b> !!!</p>");
|
||||
|
||||
// this is not good, not convert did succed
|
||||
return $data;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
Loading…
Reference in New Issue
Block a user