aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/Url.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-02-02 19:20:11 +0100
committerGitHub <noreply@github.com>2018-02-02 19:20:11 +0100
commit17b4baedec3902a1549451ede36f914000019797 (patch)
tree6e41c336cff937358f875d338b038cfee1eeed3a /application/Url.php
parent91813a363468404b7bf2937494812f1fa34a12b4 (diff)
parent28df9fa4f7d901632e7fd6e23b6d7dd345f1f6e7 (diff)
downloadShaarli-17b4baedec3902a1549451ede36f914000019797.tar.gz
Shaarli-17b4baedec3902a1549451ede36f914000019797.tar.zst
Shaarli-17b4baedec3902a1549451ede36f914000019797.zip
Merge pull request #1003 from ArthurHoaro/ci/php7.2
Drop PHP 5.5 compatibility and run Travis UT against PHP 7.2
Diffstat (limited to 'application/Url.php')
-rw-r--r--application/Url.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/Url.php b/application/Url.php
index b3759377..21c17ecc 100644
--- a/application/Url.php
+++ b/application/Url.php
@@ -260,7 +260,7 @@ class Url
260 if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) { 260 if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) {
261 return $out; 261 return $out;
262 } 262 }
263 $asciiHost = idn_to_ascii($this->parts['host']); 263 $asciiHost = idn_to_ascii($this->parts['host'], 0, INTL_IDNA_VARIANT_UTS46);
264 return str_replace($this->parts['host'], $asciiHost, $out); 264 return str_replace($this->parts['host'], $asciiHost, $out);
265 } 265 }
266 266