diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:17:33 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:17:33 +0200 |
commit | 01e942d44c7194607649817216aeb5d65c6acad6 (patch) | |
tree | 15777aa1005251f119e6dd680291147117766b5b /application/Url.php | |
parent | bc22c9a0acb095970e9494cbe8954f0612e05dc0 (diff) | |
parent | 8868f3ca461011a8fb6dd9f90b60ed697ab52fc5 (diff) | |
download | Shaarli-01e942d44c7194607649817216aeb5d65c6acad6.tar.gz Shaarli-01e942d44c7194607649817216aeb5d65c6acad6.tar.zst Shaarli-01e942d44c7194607649817216aeb5d65c6acad6.zip |
Merge tag 'v0.8.4' into stable
Release v0.8.4
Diffstat (limited to 'application/Url.php')
-rw-r--r-- | application/Url.php | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/application/Url.php b/application/Url.php index 77447c8d..c5c7dd18 100644 --- a/application/Url.php +++ b/application/Url.php | |||
@@ -62,21 +62,7 @@ function add_trailing_slash($url) | |||
62 | { | 62 | { |
63 | return $url . (!endsWith($url, '/') ? '/' : ''); | 63 | return $url . (!endsWith($url, '/') ? '/' : ''); |
64 | } | 64 | } |
65 | /** | ||
66 | * Converts an URL with an IDN host to a ASCII one. | ||
67 | * | ||
68 | * @param string $url Input URL. | ||
69 | * | ||
70 | * @return string converted URL. | ||
71 | */ | ||
72 | function url_with_idn_to_ascii($url) | ||
73 | { | ||
74 | $parts = parse_url($url); | ||
75 | $parts['host'] = idn_to_ascii($parts['host']); | ||
76 | 65 | ||
77 | $httpUrl = new \http\Url($parts); | ||
78 | return $httpUrl->toString(); | ||
79 | } | ||
80 | /** | 66 | /** |
81 | * URL representation and cleanup utilities | 67 | * URL representation and cleanup utilities |
82 | * | 68 | * |
@@ -99,6 +85,7 @@ class Url | |||
99 | 'action_type_map=', | 85 | 'action_type_map=', |
100 | 'fb_', | 86 | 'fb_', |
101 | 'fb=', | 87 | 'fb=', |
88 | 'PHPSESSID=', | ||
102 | 89 | ||
103 | // Scoop.it | 90 | // Scoop.it |
104 | '__scoop', | 91 | '__scoop', |