URLHelper: fix E_DEPRECATED error related to idn_to_ascii()

4 years ago · 328d7b55c8
parent 242aa6e411
commit 328d7b55c8
1 changed files with 5 additions and 1 deletions
--- 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']);
+				}
 			}
 		}