From: Jonathan Nieder <jrnieder@gmail.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
git@vger.kernel.org, "Jakub Narebski" <jnareb@gmail.com>,
"Pavan Kumar Sunkara" <pavan.sss1991@gmail.com>
Subject: [PATCH 2/4] gitweb: skip logo in atom feed when there is none
Date: Thu, 2 Sep 2010 18:55:47 -0500 [thread overview]
Message-ID: <20100902235546.GC6466@burratino> (raw)
In-Reply-To: <20100902235237.GA6466@burratino>
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.
Cc: Jakub Narebski <jnareb@gmail.com>
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Theoretical, untested.
gitweb/gitweb.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index a97ce03..cc20e74 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -6630,7 +6630,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";
}
--
1.7.2.2
next prev parent reply other threads:[~2010-09-02 23:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100812131152.2333.9604.reportbug@octopus.hi.pengutronix.de>
2010-09-02 22:12 ` git instaweb for Debian squeeze (Re: Bug#592733: git instaweb broken) Jonathan Nieder
2010-09-02 22:36 ` Eric Wong
2010-09-02 23:52 ` [PATCH/RFC maint-1.7.1 0/4] instaweb 1.7.1 fixes for Debian squeeze Jonathan Nieder
2010-09-02 23:54 ` [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM Jonathan Nieder
2010-09-03 17:23 ` Junio C Hamano
2010-09-03 18:20 ` Jonathan Nieder
2010-09-03 23:58 ` Jonathan Nieder
2010-09-04 1:36 ` Junio C Hamano
2010-09-04 2:19 ` Jonathan Nieder
2010-09-02 23:55 ` Jonathan Nieder [this message]
2010-09-02 23:56 ` [PATCH 3/4] gitweb: make logo optional Jonathan Nieder
2010-09-02 23:57 ` [PATCH 4/4] instaweb: disable logo and favicon by default Jonathan Nieder
2010-09-03 2:19 ` [PATCH v2 " Jonathan Nieder
2010-09-03 1:09 ` [PATCH/RFC maint-1.7.1 0/4] instaweb 1.7.1 fixes for Debian squeeze Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100902235546.GC6466@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=normalperson@yhbt.net \
--cc=pavan.sss1991@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).