mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
Merge pull request #7 from filkaris/utf8_bug
Fix multibyte bug on utf-8 import
This commit is contained in:
commit
cac41f297e
@ -74,7 +74,8 @@ use EGroupware\Api\Etemplate;
|
||||
$plugin = new $definition_obj->plugin;
|
||||
|
||||
// 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')
|
||||
{
|
||||
$preference = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
|
||||
|
Loading…
Reference in New Issue
Block a user