Merge branch 'stable'

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
@@ -625,24 +625,27 @@ char *hc(struct cgit_cmd *cmd, const char *page)
 {
         return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 
 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) {
                 cgit_index_link("index", NULL, NULL, NULL, 0);
                 html(" : ");
                 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                 html("</td><td class='form'>");
                 html("<form method='get' action=''>\n");