Merge branch 'jn/gitweb-no-logo' into maint

* jn/gitweb-no-logo: gitweb: make logo optional
git-mirror · Jan 19, 2011 · 14154ce · 14154ce
2 parents ae830c2 + 6822052
commit 14154ce
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -3516,10 +3516,15 @@ sub git_header_html {
 		insert_file($site_header);
 	}
 
-	print "<div class=\"page_header\">\n" .
-	      $cgi->a({-href => esc_url($logo_url),
-	               -title => $logo_label},
-	              qq(<img src=").esc_url($logo).qq(" width="72" height="27" alt="git" class="logo"/>));
+	print "<div class=\"page_header\">\n";
+	if (defined $logo) {
+		print $cgi->a({-href => esc_url($logo_url),
+		               -title => $logo_label},
+		              $cgi->img({-src => esc_url($logo),
+		                         -width => 72, -height => 27,
+		                         -alt => "git",
+		                         -class => "logo"}));
+	}
 	print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
 	if (defined $project) {
 		print $cgi->a({-href => href(action=>"summary")}, esc_html($project));