mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-01 04:13:28 +01:00
Api: Force merge placeholder charset to UTF-8, avoids mangled accent characters
This commit is contained in:
parent
5548926e37
commit
0543af4d82
@ -129,7 +129,7 @@ class Placeholder extends Etemplate\Widget
|
|||||||
$entry = ['id' => $GLOBALS['egw_info']['user']['person_id']];
|
$entry = ['id' => $GLOBALS['egw_info']['user']['person_id']];
|
||||||
// fall through
|
// fall through
|
||||||
default:
|
default:
|
||||||
$merged = $merge->merge_string($content, [$entry['id']], $err, 'text/plain');
|
$merged = $merge->merge_string($content, [$entry['id']], $err, 'text/plain', null, 'utf8');
|
||||||
}
|
}
|
||||||
$response = Api\Json\Response::get();
|
$response = Api\Json\Response::get();
|
||||||
$response->data($merged);
|
$response->data($merged);
|
||||||
|
Loading…
Reference in New Issue
Block a user