From 084a5a5b9329dc2825d4e3ce3bd744dcad051dda Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 24 Oct 2012 16:59:00 +0000 Subject: [PATCH] Use new translation::detect_encoding() for encoding detection --- importexport/inc/class.importexport_import_ui.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php index 39d15a2539..abbd19412a 100644 --- a/importexport/inc/class.importexport_import_ui.inc.php +++ b/importexport/inc/class.importexport_import_ui.inc.php @@ -62,7 +62,7 @@ // Check file encoding matches import $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']; - $encoding = mb_detect_encoding($sample,$required,true); + $encoding = translation::detect_encoding($sample); if($encoding && strtoupper($required) != strtoupper($encoding)) { $this->message = lang("Encoding mismatch. Expected %1 file, you uploaded %2.
\n",