From 464d4db963b7d4de02b4505f051091b9adbb41df Mon Sep 17 00:00:00 2001 From: Elisiano Petrini Date: Tue, 29 Aug 2017 14:24:39 -0400 Subject: [PATCH] Give precedence to configured filetypes and binary_filetypes instead of built-ins This is to give precedence to entries in config.ini over the built-ins in src/Util/Repository.php Fixes #743 --- src/Util/Repository.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Util/Repository.php b/src/Util/Repository.php index e15b590..0aaa60d 100644 --- a/src/Util/Repository.php +++ b/src/Util/Repository.php @@ -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; }