Merge branch 'stable'

diff --git a/ui-shared.c b/ui-shared.c
index cf065116cfdd19da8c63f0ae2324c55f9f546cac..07d5dd44a12a580920991a0a20d0296471657f95 100644 (file)
--- 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) {