diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-19 20:10:15 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-19 20:10:15 +0200 |
| commit | 27d80ec5fb8b7d107240a6ebfc4cad964c288ff3 (patch) | |
| tree | 14b2328a6e716fc2ea1407b975d53f2d067b81fd /lib | |
| parent | 163157ebde4e1885b1cf6a0da1b175371dcf6f92 (diff) | |
| parent | 2d22bf300a8dabcc77237f4bb56bf6532486fca2 (diff) | |
Merge remote-tracking branch 'origin/baseUrl' into dev
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Minz/Request.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php index b9eda82a5..67fbae126 100644 --- a/lib/Minz/Request.php +++ b/lib/Minz/Request.php @@ -100,7 +100,10 @@ class Minz_Request { } else { $url .= '://' . $host . ($port == 80 ? '' : ':' . $port); } - $url .= isset($_SERVER['REQUEST_URI']) ? dirname($_SERVER['REQUEST_URI']) : ''; + if (isset($_SERVER['REQUEST_URI'])) { + $path = $_SERVER['REQUEST_URI']; + $url .= substr($path, -1) === '/' ? substr($path, 0, -1) : dirname($path); + } } else { $url = rtrim($url, '/\\') . $baseUrlSuffix; } |