diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-07 13:24:51 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-04-07 13:24:51 +0200 |
| commit | 84285011cec209db4045e832ef03b96c7f07c1c2 (patch) | |
| tree | 97cd54c8926f7af929d282dce7a7d031ec89beed /lib/private/mail.php | |
| parent | 9c8596e95b81f9d5ddcd7132ac0134b0ffed67e5 (diff) | |
| parent | 3c9f5884490ab2e2d04eec1eb547aba036a1386e (diff) | |
| download | nextcloud-server-84285011cec209db4045e832ef03b96c7f07c1c2.tar.gz nextcloud-server-84285011cec209db4045e832ef03b96c7f07c1c2.zip | |
Merge branch 'master' into routing-cache-webroot
Diffstat (limited to 'lib/private/mail.php')
| -rw-r--r-- | lib/private/mail.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/mail.php b/lib/private/mail.php index 79f51609631..f9083cc4e64 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); |