forked from extern/egroupware
Fix multibyte bug on utf-8 import
This commit is contained in:
parent
80cb358d88
commit
fb28d7fe97
@ -74,7 +74,9 @@ 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 = file_get_contents($content['file']['tmp_name']);
|
||||||
|
$sample = mb_substr( $sample, 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'];
|
||||||
|
Loading…
Reference in New Issue
Block a user