diff options
| author | Kees van Kempen <git@keesvankempen.nl> | 2022-01-07 14:49:54 +0300 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2022-01-10 13:22:35 +0300 |
| commit | 78bd1c12d9248cf315d44eba3c2eff4101a8af42 (patch) | |
| tree | e3a74b293e16da0205a2089a6780c242855349a6 | |
| parent | d16880b382a0ac6807f21e55b64b75a312079cf2 (diff) | |
Switch from iconv to mb_convert_encoding
Fixes #1966
Signed-off-by: Kees van Kempen <git@keesvankempen.nl>
| -rw-r--r-- | lib/Controller/WopiController.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php index e3013197..15805f3f 100644 --- a/lib/Controller/WopiController.php +++ b/lib/Controller/WopiController.php @@ -455,7 +455,7 @@ class WopiController extends Controller { } $file = $file[0]; $suggested = $this->request->getHeader('X-WOPI-SuggestedTarget'); - $suggested = iconv('utf-7', 'utf-8', $suggested); + $suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7'); if ($suggested[0] === '.') { $path = dirname($file->getPath()) . '/New File' . $suggested; @@ -575,7 +575,7 @@ class WopiController extends Controller { $suggested = $this->request->getHeader('X-WOPI-RequestedName'); - $suggested = iconv('utf-7', 'utf-8', $suggested) . '.' . $file->getExtension(); + $suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7') . '.' . $file->getExtension(); if (strpos($suggested, '.') === 0) { $path = dirname($file->getPath()) . '/New File' . $suggested; @@ -610,7 +610,7 @@ class WopiController extends Controller { $file = $file[0]; $suggested = $this->request->getHeader('X-WOPI-SuggestedTarget'); - $suggested = iconv('utf-7', 'utf-8', $suggested); + $suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7'); if ($suggested[0] === '.') { $path = dirname($file->getPath()) . '/New File' . $suggested; |