gitweb: Always display link to blobdiff_plain in git_blobdiff

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 29953429eebe4e683ff6b0d064a4b31687eb0b1f..e631188ee17a2603dee21a90c393c96da6b34d9d 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2790,18 +2790,18 @@ sub git_commit {
 sub git_blobdiff {
        mkdir($git_temp, 0700);
        git_header_html();
 sub git_blobdiff {
        mkdir($git_temp, 0700);
        git_header_html();

+       my $formats_nav =
+               $cgi->a({-href => href(action=>"blobdiff_plain",
+                                      hash=>$hash, hash_parent=>$hash_parent,
+                                      hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
+                                      file_name=>$file_name, file_parent=>$file_parent)},
+                       "plain");

        if (defined $hash_base && (my %co = parse_commit($hash_base))) {
        if (defined $hash_base && (my %co = parse_commit($hash_base))) {

-               my $formats_nav =
-                       $cgi->a({-href => href(action=>"blobdiff_plain",
-                                              hash=>$hash, hash_parent=>$hash_parent,
-                                              hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
-                                              file_name=>$file_name, file_parent=>$file_parent)},
-                               "plain");

                git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
        } else {
                print <<HTML;
                git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
        } else {
                print <<HTML;

-<div class="page_nav"><br/><br/></div>
+<div class="page_nav"><br/>$formats_nav<br/></div>

 <div class="title">$hash vs $hash_parent</div>
 HTML
        }
 <div class="title">$hash vs $hash_parent</div>
 HTML
        }