From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 18 Aug 2009 11:14:11 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/73b54f7d7e21fbb15c50e21eafe1737df96b2073?hp=cb92d05b6b729cd0e219b43d7a79aff832a9c1ac

Merge branch 'stable'
---

diff --git a/ui-shared.c b/ui-shared.c
index cf06511..07d5dd4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -630,14 +630,17 @@ static void print_header(struct cgit_context *ctx)
 {
 	html("<table id='header'>\n");
 	html("<tr>\n");
-	html("<td class='logo' rowspan='2'><a href='");
-	if (ctx->cfg.logo_link)
-		html_attr(ctx->cfg.logo_link);
-	else
-		html_attr(cgit_rooturl());
-	html("'><img src='");
-	html_attr(ctx->cfg.logo);
-	html("' alt='cgit logo'/></a></td>\n");
+
+	if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+		html("<td class='logo' rowspan='2'><a href='");
+		if (ctx->cfg.logo_link)
+			html_attr(ctx->cfg.logo_link);
+		else
+			html_attr(cgit_rooturl());
+		html("'><img src='");
+		html_attr(ctx->cfg.logo);
+		html("' alt='cgit logo'/></a></td>\n");
+	}
 
 	html("<td class='main'>");
 	if (ctx->repo) {