Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2026-07-12 20:41:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Give precedence to configured filetypes and binary_filetypes instead of built-ins

Browse Source 
This is to give precedence to entries in config.ini over the built-ins
in src/Util/Repository.php

Fixes #743
This commit is contained in:
Elisiano Petrini
2017-08-29 14:24:39 -04:00
parent 398344a3fd
commit 464d4db963
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Util/Repository.php
View File

@@ -126,16 +126,16 @@ class Repository
return 'text';
}
if (isset($this->defaultFileTypes[$fileType])) {
return $this->defaultFileTypes[$fileType];
}
if (!empty($this->app['filetypes'])) {
if (isset($this->app['filetypes'][$fileType])) {
return $this->app['filetypes'][$fileType];
}
}
if (isset($this->defaultFileTypes[$fileType])) {
return $this->defaultFileTypes[$fileType];
}
return 'text';
}
@@ -154,14 +154,14 @@ class Repository
return false;
}
if (in_array($fileType, self::$binaryTypes)) {
return true;
}
if (!empty($this->app['binary_filetypes']) && array_key_exists($fileType, $this->app['binary_filetypes'])) {
return $this->app['binary_filetypes'][$fileType];
}
if (in_array($fileType, self::$binaryTypes)) {
return true;
}
return false;
}