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

Un-optional a parameter in hopes of fixing rbx build

Browse source
This commit is contained in:
Ben Hollis 2012-05-01 00:37:00 -07:00
parent 380dac270d
commit 8f861fef06
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -518,8 +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(res, type = nil, params={}) def content_type(res, type, params={})
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
throw "Unknown media type: %p" % type if mime_type.nil? throw "Unknown media type: %p" % type if mime_type.nil?