gitweb: Fix displaying unchopped argument in chop_and_escape_str

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 911ecd98cd59485f2d43ba8b0ad913ac4b23d440186aa0bbb1cd4d522a3b700f..dd5283cf4b7cabbd22ae86a877670696675093fa9a792253e79a0d0b1d1ed28b 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -867,8 +867,8 @@ sub chop_and_escape_str {
        if ($chopped eq $str) {
                return esc_html($chopped);
        } else {
-               return qq{<span title="} . esc_html($str) . qq{">} .
-                       esc_html($chopped) . qq{</span>};
+               $str =~ s/([[:cntrl:]])/?/g;
+               return $cgi->span({-title=>$str}, esc_html($chopped));
        }
 }
 
@@ -1760,6 +1760,7 @@ sub git_get_project_owner {
        my $owner;
 
        return undef unless $project;
+       $git_dir = "$projectroot/$project";
 
        if (!defined $gitweb_project_owner) {
                git_get_project_list_from_file();
@@ -1768,8 +1769,11 @@ sub git_get_project_owner {
        if (exists $gitweb_project_owner->{$project}) {
                $owner = $gitweb_project_owner->{$project};
        }
+       if (!defined $owner){
+               $owner = git_get_project_config('owner');
+       }
        if (!defined $owner) {
-               $owner = get_file_owner("$projectroot/$project");
+               $owner = get_file_owner("$git_dir");
        }
 
        return $owner;