From 83b4bcfdbf832f1ebc78c9cf6f6aba5490b65cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 26 Mar 2014 11:17:23 +0100
Subject: [PATCH] idn_to_ascii is only used if available
---
lib/private/mail.php | 3 +++
tests/lib/mail.php | 9 +++++++++
2 files changed, 12 insertions(+)
diff --git a/lib/private/mail.php b/lib/private/mail.php
index 79f5160963..f9083cc4e6 100644
--- a/lib/private/mail.php
+++ b/lib/private/mail.php
@@ -137,6 +137,9 @@ class OC_Mail {
* @return string
*/
public static function buildAsciiEmail($emailAddress) {
+ if (!function_exists('idn_to_ascii')) {
+ return $emailAddress;
+ }
list($name, $domain) = explode('@', $emailAddress, 2);
$domain = idn_to_ascii($domain);
diff --git a/tests/lib/mail.php b/tests/lib/mail.php
index a88a9d797a..3cc9868e25 100644
--- a/tests/lib/mail.php
+++ b/tests/lib/mail.php
@@ -8,6 +8,15 @@
class Test_Mail extends PHPUnit_Framework_TestCase {
+ protected function setUp()
+ {
+ if (!function_exists('idn_to_ascii')) {
+ $this->markTestSkipped(
+ 'The intl extension is not available.'
+ );
+ }
+ }
+
/**
* @dataProvider buildAsciiEmailProvider
* @param $expected
--
GitLab