Merge branch 'maint'

* maint: gitweb: skip logo in atom feed when there is none t9001: Fix test prerequisites
2011-01-04 11:23:45 -08:00
parent 081f84ee9e 9d9f5e72dc
commit f2665ec9fa
2 changed files with 3 additions and 3 deletions
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@ -7169,7 +7169,7 @@ XML
 		if (defined $favicon) {
 			print "<icon>" . esc_url($favicon) . "</icon>\n";
 		}
-		if (defined $logo_url) {
+		if (defined $logo) {
 			# not twice as wide as tall: 72 x 27 pixels
 			print "<logo>" . esc_url($logo) . "</logo>\n";
 		}