diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2012-04-04 14:25:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-11 09:51:00 -0700 |
| commit | cc999a3a0845fcab83a8dcecd3fcdd86f03c10b6 (patch) | |
| tree | 35bca14b1bff18905097574876d80f5a4a0085d0 /gitweb | |
| parent | 7945c7fad05da2ac7f6f1f89202799993a591eac (diff) | |
| download | git-cc999a3a0845fcab83a8dcecd3fcdd86f03c10b6.tar.gz git-cc999a3a0845fcab83a8dcecd3fcdd86f03c10b6.tar.xz | |
gitweb: Fix unintended "--no-merges" for regular Atom feed
The print_feed_meta() subroutine generates links for feeds with and
without merges, in RSS and Atom formats. However because %href_params
was not properly reset, it generated links with "--no-merges" for all
except the very first link.
Before:
<link rel="alternate" title="[..] - Atom feed" href="/?p=.git;a=atom;opt=--no-merges" type="application/atom+xml" />
<link rel="alternate" title="[..] - Atom feed (no merges)" href="/?p=.git;a=atom;opt=--no-merges" type="application/atom+xml" />
After:
<link rel="alternate" title="[..] - Atom feed" href="/?p=.git;a=atom" type="application/atom+xml" />
<link rel="alternate" title="[..] - Atom feed (no merges)" href="/?p=.git;a=atom;opt=--no-merges" type="application/atom+xml" />
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index a8b5fad26..ca6f038c9 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3886,6 +3886,7 @@ sub print_feed_meta { '-type' => "application/$type+xml" ); + $href_params{'extra_options'} = undef; $href_params{'action'} = $type; $link_attr{'-href'} = href(%href_params); print "<link ". |