undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/web' into next

Browse Source
This commit is contained in:
Junio C Hamano 2006-06-20 03:00:13 -07:00
commit 02ca920481
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitweb/gitweb.cgi
View File

@ -1518,7 +1518,7 @@ sub mimetype_guess {
if ($mimetypes_file) { if ($mimetypes_file) {
my $file = $mimetypes_file; my $file = $mimetypes_file;
$file =~ m#^/# or $file = "$projectroot/$path/$file"; #$file =~ m#^/# or $file = "$projectroot/$path/$file";
$mime = mimetype_guess_file($filename, $file); $mime = mimetype_guess_file($filename, $file);
} }
$mime ||= mimetype_guess_file($filename, '/etc/mime.types'); $mime ||= mimetype_guess_file($filename, '/etc/mime.types');