gitweb: Use the config file to set repository owner's name.

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index ff3623bad8aefdd2dc26664c4bf67735486eb5b3e023950ffa7e87b8a00398e5..5a5fb61c03422c8aabdb3ee836e2893aabbf856482e846854503a98cd39393eb 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1621,7 +1621,7 @@ sub git_get_project_url_list {
        my $path = shift;
 
        $git_dir = "$projectroot/$path";
-       open my $fd, "$projectroot/$path/cloneurl"
+       open my $fd, "$git_dir/cloneurl"
                or return wantarray ?
                @{ config_to_multi(git_get_project_config('url')) } :
                   config_to_multi(git_get_project_config('url'));
@@ -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;