mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 10:15:28 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#616 where PHP 7.2 is throwing deprecation notices for default arguments of idn_to_utf8() and idn_to_ascii(). The deprecation change and new defaults for next major PHP version does not appear to affect our usage after several tests, so opted to suppress these notices.

Browse Source
This commit is contained in:
Ryan Cramer
2018-06-15 07:58:50 -04:00
parent 828a80f1f6
commit 28d275fe4d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wire/core/Sanitizer.php
View File

@@ -611,7 +611,7 @@ class Sanitizer extends Wire {
if(strpos($value, 'xn--') !== 0) $value = 'xn--' . substr($value, 3);
if(function_exists('idn_to_utf8')) {
// use native php function if available
$value = idn_to_utf8($value);
$value = @idn_to_utf8($value);
} else {
// otherwise use Punycode class
$pc = new Punycode();
@@ -654,7 +654,7 @@ class Sanitizer extends Wire {
if(function_exists("idn_to_ascii")) {
// use native php function if available
$value = substr(idn_to_ascii($value), 3);
$value = substr(@idn_to_ascii($value), 3);
} else {
// otherwise use Punycode class
$pc = new Punycode();
@@ -1550,13 +1550,13 @@ class Sanitizer extends Wire {
} else {
// domain contains utf8
$pc = function_exists("idn_to_ascii") ? false : new Punycode();
$domain = $pc ? $pc->encode($domain) : idn_to_ascii($domain);
$domain = $pc ? $pc->encode($domain) : @idn_to_ascii($domain);
if($domain === false || !strlen($domain)) return '';
$url = $scheme . $domain . $rest;
$url = filter_var($url, FILTER_VALIDATE_URL);
if(strlen($url)) {
// convert back to utf8 domain
$domain = $pc ? $pc->decode($domain) : idn_to_utf8($domain);
$domain = $pc ? $pc->decode($domain) : @idn_to_utf8($domain);
if($domain === false) return '';
$url = $scheme . $domain . $rest;
}