Re: [PATCH 1/2] gitweb: skip logo in atom feed when there is none
Show 8 quoted lines
> Date: Fri, 3 Sep 2010 19:44:39 -0500
>
> 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>
Good catch. As an obvious bugfix:
Acked-by: Jakub Narebski <jnareb@gmail.com>
Show 21 quoted lines
> ---
> gitweb/gitweb.perl | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 4779618..c65af1a 100755
> --- 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";
> }
> --
> 1.7.4.rc0
>
> --
Jakub Narebski
Poland
Jakub Narebski <jnareb@gmail.com>