summaryrefslogtreecommitdiff
path: root/classes/urlhelper.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-11-14 15:13:35 +0300
committerAndrew Dolgov <[email protected]>2020-11-14 15:13:35 +0300
commit328d7b55c8cb4d56492356a73df19f7c59784d82 (patch)
treec81905de34b96e86439a83fbdbda27074300eeb1 /classes/urlhelper.php
parent242aa6e4114701a1d31d487657e8f50dd57de7c5 (diff)
URLHelper: fix E_DEPRECATED error related to idn_to_ascii()
Diffstat (limited to 'classes/urlhelper.php')
-rw-r--r--classes/urlhelper.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/classes/urlhelper.php b/classes/urlhelper.php
index d7b7d004a..cc1074c55 100644
--- a/classes/urlhelper.php
+++ b/classes/urlhelper.php
@@ -67,7 +67,11 @@ class UrlHelper {
//convert IDNA hostname to punycode if possible
if (function_exists("idn_to_ascii")) {
if (mb_detect_encoding($tokens['host']) != 'ASCII') {
- $tokens['host'] = idn_to_ascii($tokens['host']);
+ if (defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46')) {
+ $tokens['host'] = idn_to_ascii($tokens['host'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+ } else {
+ $tokens['host'] = idn_to_ascii($tokens['host']);
+ }
}
}