diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-28 05:22:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-28 05:34:19 (GMT) |
| commit | b71ce7f3f13ebd0e212bdda82b012ee36df4f63f (patch) | |
| tree | 770119a6f5ba788a15fd91b3ad29490b94a86e43 /gitweb | |
| parent | 37b78c25476d752953dc541e46fbb6bd5017edf7 (diff) | |
| parent | 28bc30220f30850a10217d61f73e46d8a541e670 (diff) | |
| download | git-b71ce7f3f13ebd0e212bdda82b012ee36df4f63f.zip git-b71ce7f3f13ebd0e212bdda82b012ee36df4f63f.tar.gz git-b71ce7f3f13ebd0e212bdda82b012ee36df4f63f.tar.bz2 | |
Merge 1.5.5.3 in
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 8308e22..57a1905 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2756,7 +2756,7 @@ sub git_print_page_nav { } sub format_paging_nav { - my ($action, $hash, $head, $page, $nrevs) = @_; + my ($action, $hash, $head, $page, $has_next_link) = @_; my $paging_nav; @@ -2774,7 +2774,7 @@ sub format_paging_nav { $paging_nav .= " ⋅ prev"; } - if ($nrevs >= (100 * ($page+1)-1)) { + if ($has_next_link) { $paging_nav .= " ⋅ " . $cgi->a({-href => href(-replay=>1, page=>$page+1), -accesskey => "n", -title => "Alt-n"}, "next"); @@ -4665,7 +4665,7 @@ sub git_log { my @commitlist = parse_commits($hash, 101, (100 * $page)); - my $paging_nav = format_paging_nav('log', $hash, $head, $page, (100 * ($page+1))); + my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#commitlist >= 100); git_header_html(); git_print_page_nav('log','', $hash,undef,undef, $paging_nav); @@ -5585,7 +5585,7 @@ sub git_shortlog { my @commitlist = parse_commits($hash, 101, (100 * $page)); - my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, (100 * ($page+1))); + my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, $#commitlist >= 100); my $next_link = ''; if ($#commitlist >= 100) { $next_link = |