Avoids using iconv with '//IGNORE' flag if possible

Signed-off-by: Cyrille Bollu <cyr.debian@bollu.be>

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/Address.php b/lib/Address.php
index cfa96169a..119659b27 100644
--- a/lib/Address.php
+++ b/lib/Address.php
@@ -79,6 +79,12 @@ class Address implements JsonSerializable {
 			return null;
 		}
 		// Lets make sure the e-mail is valid UTF-8 at all times
+		// Try a soft conversion first (some installations, eg: Alpine linux,
+		// have issues with the '//IGNORE' option)
+		$utf8 = iconv('UTF-8', 'UTF-8', $email);
+		if ($utf8 !== false) {
+			return $utf8;
+		}
 		$utf8 = iconv("UTF-8", "UTF-8//IGNORE", $email);
 		if ($utf8 === false) {
 			throw new \Exception("Email address <$email> could not be converted via iconv");