1 files changed, 6 insertions, 2 deletions

diff --git a/ui-shared.c b/ui-shared.c
index b0cff7d..6211056 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -40,50 +40,54 @@ void cgit_print_error(char *msg)
         html("</div>\n");
 }
 
 char *cgit_rooturl()
 {
         if (cgit_virtual_root)
                 return fmt("%s/", cgit_virtual_root);
         else
                 return cgit_script_name;
 }
 
 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) {
-                return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
-                           pagename, query);
+                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)
                 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
         else
                 return fmt("%s/", cgit_virtual_root);
 }
 
 
 void cgit_print_date(unsigned long secs)
 {
         char buf[32];
         struct tm *time;
 
         time = gmtime(&secs);