1 files changed, 4 insertions, 0 deletions

diff --git a/ui-shared.c b/ui-shared.c
index b0cff7d..6211056 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -52,26 +52,30 @@ char *cgit_repourl(const char *reponame)
 {
         if (cgit_virtual_root) {
                 return fmt("%s/%s/", cgit_virtual_root, reponame);
         } else {
                 return fmt("?r=%s", reponame);
         }
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
                    const char *query)
 {
         if (cgit_virtual_root) {
+                if (query)
                 return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
                            pagename, query);
+                else
+                        return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
+                                   pagename);
         } else {
                 return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
         }
 }
 
 char *cgit_currurl()
 {
         if (!cgit_virtual_root)
                 return cgit_script_name;
         else if (cgit_query_page)
                 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
         else if (cgit_query_repo)