gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')

[Gitweb] / gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl

index 85197f51f7c6e4b67d93eb4be6a5b44b52706e900d87823cbdb3643099eb4f29..c12a6ce6c180341cc709a7b13023f4272c32758549c2a5186fb452d8dba5bb0e 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -18,6 +18,10 @@ use File::Find qw();
  use File::Basename qw(basename);
  binmode STDOUT, ':utf8';
  
+BEGIN {
+       CGI->compile() if $ENV{MOD_PERL};
+}
+
  our $cgi = new CGI;
  our $version = "++GIT_VERSION++";
  our $my_url = $cgi->url();
@@ -1712,6 +1716,7 @@ sub git_header_html {
         }
         print $cgi->header(-type=>$content_type, -charset => 'utf-8',
                            -status=> $status, -expires => $expires);
+       my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
         print <<EOF;
  <?xml version="1.0" encoding="utf-8"?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -1720,7 +1725,7 @@ sub git_header_html {
  <!-- git core binaries version $git_version -->
  <head>
  <meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
-<meta name="generator" content="gitweb/$version git/$git_version"/>
+<meta name="generator" content="gitweb/$version git/$git_version$mod_perl_version"/>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>
  EOF
@@ -2270,7 +2275,7 @@ sub git_difftree_body {
                         my $mode_chnge = "";
                         if ($diff{'from_mode'} != $diff{'to_mode'}) {
                                 $mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
-                               if ($from_file_type != $to_file_type) {
+                               if ($from_file_type ne $to_file_type) {
                                         $mode_chnge .= " from $from_file_type to $to_file_type";
                                 }
                                 if (($from_mode_oct & 0777) != ($to_mode_oct & 0777)) {
@@ -2991,7 +2996,7 @@ sub git_project_index {
  
         foreach my $pr (@projects) {
                 if (!exists $pr->{'owner'}) {
-                       $pr->{'owner'} = get_file_owner("$projectroot/$project");
+                       $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}");
                 }
  
                 my ($path, $owner) = ($pr->{'path'}, $pr->{'owner'});