summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLars Hjemli2009-01-11 22:00:25 +0100
committerLars Hjemli2009-01-11 22:00:25 +0100
commit31665579c2779669c0cc56b8eb63f162b7e165df (patch)
treeb1d7ed4cd04699d3f978950e09c1218944926175
parent372b4041bd117cf073082559e1f0160d75f57374 (diff)
parenteb14609dc46461728a065c0a243b338fc32fd762 (diff)
downloadcgit-31665579c2779669c0cc56b8eb63f162b7e165df.tar
cgit-31665579c2779669c0cc56b8eb63f162b7e165df.tar.gz
cgit-31665579c2779669c0cc56b8eb63f162b7e165df.zip
Merge branch 'stable'
-rw-r--r--cgit.c1
-rw-r--r--ui-shared.c7
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='");
a id='n194' href='#n194'>194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285