Merge branch 'baseUrl' of https://github.com/Alkarex/FreshRSS into 906-fix-getBaseUrl

9 years ago · 2e544d2c1a
parent 28dd652228 2d22bf300a
commit 2e544d2c1a
1 changed files with 4 additions and 1 deletions
--- 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;
 		}