extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use new translation::detect_encoding() for encoding detection

Browse Source
This commit is contained in:
Nathan Gray 2012-10-24 16:59:00 +00:00
parent 99e1cad866
commit 084a5a5b93
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -62,7 +62,7 @@
// Check file encoding matches import // Check file encoding matches import
$sample = file_get_contents($content['file']['tmp_name'],false, null, 0, 1024); $sample = file_get_contents($content['file']['tmp_name'],false, null, 0, 1024);
$required = $options['charset'] == 'user' || !$options['charset'] ? $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'] : $options['charset']; $required = $options['charset'] == 'user' || !$options['charset'] ? $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'] : $options['charset'];
$encoding = mb_detect_encoding($sample,$required,true); $encoding = translation::detect_encoding($sample);
if($encoding && strtoupper($required) != strtoupper($encoding)) if($encoding && strtoupper($required) != strtoupper($encoding))
{ {
$this->message = lang("Encoding mismatch. Expected %1 file, you uploaded %2.<br />\n", $this->message = lang("Encoding mismatch. Expected %1 file, you uploaded %2.<br />\n",