extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from filkaris/utf8_bug

Browse Source 
Fix multibyte bug on utf-8 import
This commit is contained in:
Ralf Becker 2017-02-28 14:05:23 +01:00 committed by GitHub
commit cac41f297e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,8 @@ use EGroupware\Api\Etemplate;
$plugin = new $definition_obj->plugin; $plugin = new $definition_obj->plugin;
// Check file encoding matches import // Check file encoding matches import
$sample = file_get_contents($content['file']['tmp_name'],false, null, 0, 1024); $sample = mb_substr(file_get_contents($content['file']['tmp_name'], false, null, 0, 2048), 1024);
if($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard') if($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
{ {
$preference = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset']; $preference = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];