gitweb: skip logo in atom feed when there is none

jrn · gitster · commit 9d9f5e72dc59 · 2011-01-04T10:48:37.000-08:00
With v1.5.0-rc0~169 (gitweb: Fix Atom feed &lt;logo&gt;: it is $logo,
not $logo_url, 2006-12-04), the logo URI to be written to Atom
feeds was corrected but the case of no logo forgotten.

Acked-by: Eric Wong &lt;normalperson@yhbt.net&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Acked-by: Jakub Narebski &lt;jnareb@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -6870,7 +6870,7 @@ sub git_feed {
 		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";
 		}

Original file line number	Diff line number	Diff line change
`@@ -6870,7 +6870,7 @@ sub git_feed {`
`6870`	`6870`	`if (defined $favicon) {`
`6871`	`6871`	`print "<icon>" . esc_url($favicon) . "</icon>\n";`
`6872`	`6872`	`}`
`6873`		`- if (defined $logo_url) {`
	`6873`	`+ if (defined $logo) {`
`6874`	`6874`	`# not twice as wide as tall: 72 x 27 pixels`
`6875`	`6875`	`print "<logo>" . esc_url($logo) . "</logo>\n";`
`6876`	`6876`	`}`