From 9169c3a7ac3f1def04ccc34b03b4b8f7a9e82208 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sun, 4 Nov 2012 18:54:21 +0100 Subject: routing.inc.php: Return proper (non-virtual) URIs Make sure we always return root-relative URIs in get_pkg_uri() and in get_user_uri() and prepend a slash ("/") if the virtual URL feature is disabled. Signed-off-by: Lukas Fleischer --- web/lib/routing.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index dfd6942..206886c 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -54,7 +54,7 @@ function get_pkg_uri($pkgname) { if ($USE_VIRTUAL_URLS) { return $PKG_PATH . '/' . urlencode($pkgname) . '/'; } else { - return get_route($PKG_PATH) . '?N=' . urlencode($pkgname); + return '/' . get_route($PKG_PATH) . '?N=' . urlencode($pkgname); } } @@ -70,6 +70,6 @@ function get_user_uri($username) { if ($USE_VIRTUAL_URLS) { return $USER_PATH . '/' . urlencode($username) . '/'; } else { - return get_route($USER_PATH) . '?U=' . urlencode($username); + return '/' . get_route($USER_PATH) . '?U=' . urlencode($username); } } -- cgit v1.2.3-54-g00ecf