aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-09-03 19:44:39 -0500
committerJunio C Hamano <gitster@pobox.com>2011-01-04 10:48:37 -0800
commit9d9f5e72dc5959750498acc81b3e2c8ca76ad499 (patch)
treedc0e1d286a449346e63e00715bc44190f4f23e0e
parent57da20426417cd0834e7fc442096d1c18924228a (diff)
downloadgit-9d9f5e72dc5959750498acc81b3e2c8ca76ad499.tar.gz
git-9d9f5e72dc5959750498acc81b3e2c8ca76ad499.tar.xz
gitweb: skip logo in atom feed when there is none
With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: 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 <normalperson@yhbt.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 42cc1da7f..59b2e08b9 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -6870,7 +6870,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";
}