summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-18 11:14:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-18 11:14:11 (UTC)
commit73b54f7d7e21fbb15c50e21eafe1737df96b2073 (patch) (unidiff)
tree50b27e54f940e4a3c645e48a73431d4014e18eed
parentcb92d05b6b729cd0e219b43d7a79aff832a9c1ac (diff)
parent6421dc38db02eff8d3ada93e87a2f7e5292af131 (diff)
downloadcgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.zip
cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.tar.gz
cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/ui-shared.c b/ui-shared.c
index cf06511..07d5dd4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -632,10 +632,13 @@ static void print_header(struct cgit_context *ctx)
632 html("<tr>\n"); 632 html("<tr>\n");
633 html("<td class='logo' rowspan='2'><a href='"); 633
634 if (ctx->cfg.logo_link) 634 if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
635 html_attr(ctx->cfg.logo_link); 635 html("<td class='logo' rowspan='2'><a href='");
636 else 636 if (ctx->cfg.logo_link)
637 html_attr(cgit_rooturl()); 637 html_attr(ctx->cfg.logo_link);
638 html("'><img src='"); 638 else
639 html_attr(ctx->cfg.logo); 639 html_attr(cgit_rooturl());
640 html("' alt='cgit logo'/></a></td>\n"); 640 html("'><img src='");
641 html_attr(ctx->cfg.logo);
642 html("' alt='cgit logo'/></a></td>\n");
643 }
641 644