PHP 7.2: Fixed deprecated IDN variant

Closes getkirby/kirby#608.
getkirby-v2 · Oct 22, 2017 · 2786a1c · 2786a1c
1 parent 88b001e
commit 2786a1c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/url.php b/lib/url.php
@@ -380,7 +380,8 @@ public static function idn($url) {
     if(!function_exists('idn_to_utf8')) return $url;
 
     // disassemble the URL, convert the domain name and reassemble
-    $host = idn_to_utf8(static::host($url));
+    $variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
+    $host = idn_to_utf8(static::host($url), 0, $variant);
     if($host === false) return $url;
     $url  = static::build(['host' => $host], $url);
 
@@ -400,7 +401,8 @@ public static function unIdn($url) {
     if(!function_exists('idn_to_ascii')) return $url;
 
     // disassemble the URL, convert the domain name and reassemble
-    $host = idn_to_ascii(static::host($url));
+    $variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003;
+    $host = idn_to_ascii(static::host($url), 0, $variant);
     if($host === false) return $url;
     $url  = static::build(['host' => $host], $url);