From 0543af4d822d1ddd5f8f279694d15ffd2505a90b Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Fri, 3 Dec 2021 11:36:02 -0700
Subject: [PATCH] Api: Force merge placeholder charset to UTF-8, avoids mangled
 accent characters

---
 api/src/Etemplate/Widget/Placeholder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/Etemplate/Widget/Placeholder.php b/api/src/Etemplate/Widget/Placeholder.php
index c2f933c6c8..776cff0c01 100644
--- a/api/src/Etemplate/Widget/Placeholder.php
+++ b/api/src/Etemplate/Widget/Placeholder.php
@@ -129,7 +129,7 @@ class Placeholder extends Etemplate\Widget
 				$entry = ['id' => $GLOBALS['egw_info']['user']['person_id']];
 			// fall through
 			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->data($merged);