X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUrl.php;h=25a62a8ab3fb5dafa02870ab968418038ef21d37;hb=7f96d9ec21a95cb85d0292b46e18235b20efbcb2;hp=c166ff6ef03f6023c2bf895279f8eb8940736ba9;hpb=649af5b501d2a90448242f53764ff693e9854039;p=github%2Fshaarli%2FShaarli.git diff --git a/application/Url.php b/application/Url.php index c166ff6e..25a62a8a 100644 --- a/application/Url.php +++ b/application/Url.php @@ -62,21 +62,7 @@ function add_trailing_slash($url) { return $url . (!endsWith($url, '/') ? '/' : ''); } -/** - * Converts an URL with an IDN host to a ASCII one. - * - * @param string $url Input URL. - * - * @return string converted URL. - */ -function url_with_idn_to_ascii($url) -{ - $parts = parse_url($url); - $parts['host'] = idn_to_ascii($parts['host']); - $httpUrl = new \http\Url($parts); - return $httpUrl->toString(); -} /** * URL representation and cleanup utilities * @@ -108,7 +94,10 @@ class Url 'utm_', // ATInternet - 'xtor=' + 'xtor=', + + // Other + 'campaign_' ); private static $annoyingFragments = array(