diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 22:00:25 +0100 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 22:00:25 +0100 |
| commit | 31665579c2779669c0cc56b8eb63f162b7e165df (patch) | |
| tree | b1d7ed4cd04699d3f978950e09c1218944926175 | |
| parent | Make all tags viewable (diff) | |
| parent | Avoid SEGFAULT on invalid requests (diff) | |
| download | cgit-pink-31665579c2779669c0cc56b8eb63f162b7e165df.tar.gz cgit-pink-31665579c2779669c0cc56b8eb63f162b7e165df.zip | |
Merge branch 'stable'
| -rw-r--r-- | cgit.c | 1 | ||||
| -rw-r--r-- | ui-shared.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c index d1cee58..f35f605 100644 --- a/cgit.c +++ b/cgit.c @@ -293,7 +293,6 @@ static void process_request(void *cbdata) cmd = cgit_get_cmd(ctx); if (!cmd) { ctx->page.title = "cgit error"; - ctx->repo = NULL; cgit_print_http_headers(ctx); cgit_print_docstart(ctx); cgit_print_pageheader(ctx); diff --git a/ui-shared.c b/ui-shared.c index 95dfeb4..fba1ba6 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -587,15 +587,20 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) } } +const char *fallback_cmd = "repolist"; + char *hc(struct cgit_cmd *cmd, const char *page) { - return (strcmp(cmd->name, page) ? NULL : "active"); + return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); } void cgit_print_pageheader(struct cgit_context *ctx) { struct cgit_cmd *cmd = cgit_get_cmd(ctx); + if (!cmd && ctx->repo) + fallback_cmd = "summary"; + html("<table id='header'>\n"); html("<tr>\n"); html("<td class='logo' rowspan='2'><a href='"); |