diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-04-05 13:07:53 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-04-05 13:07:53 +0200 |
| commit | 77cf3e907288c34a72b053f758a821d4a707a5d7 (patch) | |
| tree | 1fb161a19a00455c21f653931463a0303fa6bed5 /lib | |
| parent | b812bb0c14b3fe5aeba102d4b8ea80e730f1ec31 (diff) | |
| parent | 06b76831dece01f836c9d0a3cc32c3f59910fe60 (diff) | |
Merge remote-tracking branch 'origin/IDN' into dev
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lib_rss.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 79be90a1c..6342011c8 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -51,15 +51,15 @@ function classAutoloader($class) { spl_autoload_register('classAutoloader'); //</Auto-loading> -function idn_to_punny($url) { +function idn_to_puny($url) { if (function_exists('idn_to_ascii')) { $parts = parse_url($url); if (!empty($parts['host'])) { $idn = $parts['host']; - $punny = idn_to_ascii($idn); + $puny = idn_to_ascii($idn); $pos = strpos($url, $idn); if ($pos !== false) { - return substr_replace($url, $punny, $pos, strlen($idn)); + return substr_replace($url, $puny, $pos, strlen($idn)); } } } @@ -73,7 +73,7 @@ function checkUrl($url) { if (!preg_match ('#^https?://#i', $url)) { $url = 'http://' . $url; } - $url = idn_to_punny($url); //PHP bug #53474 IDN + $url = idn_to_puny($url); //PHP bug #53474 IDN if (filter_var($url, FILTER_VALIDATE_URL) || (version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($url, '-') > 0) && //PHP bug #51192 ($url === filter_var($url, FILTER_SANITIZE_URL)))) { |