gitweb: Fix project-specific feature override behavior

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 77b63fcbcb8989780cf93380f9385e1abbf28ff5055b0fb5aa290d4cadc88bde..9e4bd619b4a392736261780167e3661e2f9ad6d3d07549a34b49422dbb656462 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -455,7 +455,11 @@ sub gitweb_get_feature {
                $feature{$name}{'sub'},
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});
-       if (!$override) { return @defaults; }
+       # project specific override is possible only if we have project
+       our $git_dir; # global variable, declared later
+       if (!$override || !defined $git_dir) {
+               return @defaults;
+       }
        if (!defined $sub) {
                warn "feature $name is not overridable";
                return @defaults;
@@ -2213,6 +2217,9 @@ sub config_to_multi {
 sub git_get_project_config {
        my ($key, $type) = @_;
 
+       # do we have project
+       return unless (defined $project && defined $git_dir);
+
        # key sanity check
        return unless ($key);
        $key =~ s/^gitweb\.//;