public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-19 15:01:30 +00:00
Code Issues Releases Wiki Activity

URLHelper: fix E_DEPRECATED error related to idn_to_ascii()

Browse Source
This commit is contained in:
Andrew Dolgov
2020-11-14 15:13:35 +03:00
parent 242aa6e411
commit 328d7b55c8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/urlhelper.php
View File

@@ -67,9 +67,13 @@ class UrlHelper {
//convert IDNA hostname to punycode if possible //convert IDNA hostname to punycode if possible
if (function_exists("idn_to_ascii")) { if (function_exists("idn_to_ascii")) {
if (mb_detect_encoding($tokens['host']) != 'ASCII') { if (mb_detect_encoding($tokens['host']) != 'ASCII') {
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']); $tokens['host'] = idn_to_ascii($tokens['host']);
} }
} }
}
// separate set of tokens with urlencoded 'path' because filter_var() rightfully fails on non-latin characters // separate set of tokens with urlencoded 'path' because filter_var() rightfully fails on non-latin characters
// (used for validation only, we actually request the original URL, in case of urlencode breaking it) // (used for validation only, we actually request the original URL, in case of urlencode breaking it)