Ensure our custom mime types override mime-types lib

This commit is contained in:
Joshua Peek
2012-03-28 10:22:32 -05:00
parent 801200a203
commit 4c0a8b1ccf
5 changed files with 35 additions and 23 deletions

View File

@@ -53,7 +53,7 @@ module Linguist
#
# Returns a content type String.
def content_type
@content_type ||= binary? ? mime_type :
@content_type ||= (binary_mime_type? || binary?) ? mime_type :
(encoding ? "text/plain; charset=#{encoding.downcase}" : "text/plain")
end