mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-18 20:51:23 +01:00
fixed stalled mail compose dialog if name of user contained non-ascii characters AND export charset was not utf-8
This commit is contained in:
parent
a764acd10e
commit
002f886ca7
@ -704,7 +704,7 @@ class emailadmin_account implements ArrayAccess
|
|||||||
$err = null;
|
$err = null;
|
||||||
$value = $merge->merge_string($value,
|
$value = $merge->merge_string($value,
|
||||||
(array)accounts::id2name($account_id, 'person_id'),
|
(array)accounts::id2name($account_id, 'person_id'),
|
||||||
$err, $name == 'ident_signature' ? 'text/html' : 'text/plain');
|
$err, $name == 'ident_signature' ? 'text/html' : 'text/plain', null, 'utf-8');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//error_log(__METHOD__."(".array2string($identity).") returning ".array2string($to_replace));
|
//error_log(__METHOD__."(".array2string($identity).") returning ".array2string($to_replace));
|
||||||
|
Loading…
Reference in New Issue
Block a user