extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Api: Force merge placeholder charset to UTF-8, avoids mangled accent characters

Browse Source
This commit is contained in:
nathan 2021-12-03 11:36:02 -07:00
parent 5548926e37
commit 0543af4d82
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Etemplate/Widget/Placeholder.php
View File

@ -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);