about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-05-16 02:06:28 +0200
committerLars Hjemli2007-05-16 02:06:28 +0200
commit723469962b42de9f73960a883403cfdc422f176f (patch)
tree6f0090acb7ba5f79524197ec2e8419c8556d8fac
parentAdd support for tree listing via h parameter (diff)
downloadcgit-723469962b42de9f73960a883403cfdc422f176f.tar.gz
cgit-723469962b42de9f73960a883403cfdc422f176f.zip
Make git_pageurl handle NULL querystrings
This is suddenly useful after the repo.defbranch-related changes.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-shared.c8
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
@@ -61,8 +61,12 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
61 const char *query) 61 const char *query)
62{ 62{
63 if (cgit_virtual_root) { 63 if (cgit_virtual_root) {
64 return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, 64 if (query)
65 pagename, query); 65 return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
66 pagename, query);
67 else
68 return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
69 pagename);
66 } else { 70 } else {
67 return fmt("?r=%s&p=%s&%s", reponame, pagename, query); 71 return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
68 } 72 }