D25249.1734850316.diff
No OneTemporary
Actions

Size

652 B

Referenced Files

None

Subscribers

None

D25249.1734850316.diff
View Options

	diff --git a/src/utils/utf8.php b/src/utils/utf8.php
	--- a/src/utils/utf8.php
	+++ b/src/utils/utf8.php
	@@ -718,13 +718,10 @@
	'mbstring'));
	}

	- $result = @mb_convert_encoding($string, $to_encoding, $from_encoding);
	-
	- if ($result === false) {
	- $message = error_get_last();
	- if ($message) {
	- $message = idx($message, 'message', pht('Unknown error.'));
	- }
	+ try {
	+ $result = mb_convert_encoding($string, $to_encoding, $from_encoding);
	+ } catch (Throwable $ex) {
	+ $message = $ex->getMessage();
	throw new Exception(
	pht(
	"String conversion from encoding '%s' to encoding '%s' failed: %s",