deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch content_type param order for 1.8

Browse source
This commit is contained in:
Ben Hollis 2012-05-01 00:22:04 -07:00
parent 7bd5ed1344
commit 380dac270d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
middleman-core/lib/middleman-core/application.rb
View file

@ -427,7 +427,7 @@ module Middleman
self.current_path = request_path.dup self.current_path = request_path.dup
# Set a HTTP content type based on the request's extensions # Set a HTTP content type based on the request's extensions
content_type(resource.mime_type, env) content_type(res, resource.mime_type)
begin begin
# Write out the contents of the page # Write out the contents of the page
@ -504,7 +504,7 @@ module Middleman
extension = File.extname(path) extension = File.extname(path)
matched_mime = mime_type(extension) matched_mime = mime_type(extension)
matched_mime = "application/octet-stream" if matched_mime.nil? matched_mime = "application/octet-stream" if matched_mime.nil?
content_type matched_mime, res content_type res, matched_mime
file = ::Rack::File.new nil file = ::Rack::File.new nil
file.path = path file.path = path
@ -518,7 +518,7 @@ module Middleman
# @param [String] type Content type # @param [String] type Content type
# @param [Hash] params # @param [Hash] params
# @return [void] # @return [void]
def content_type(type = nil, params={}, res) def content_type(res, type = nil, params={})
return res['Content-Type'] unless type return res['Content-Type'] unless type
default = params.delete :default default = params.delete :default
mime_type = mime_type(type) || default mime_type = mime_type(type) || default