提交 b72304f4 编写于 作者: G Guillermo Iguaran

Merge pull request #12838 from strzalek/remove_mime_type_order_var

Remove @order attribute from collector
......@@ -396,10 +396,10 @@ def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc:
# request, with this response then being accessible by calling #response.
class Collector
include AbstractController::Collector
attr_accessor :order, :format
attr_accessor :format
def initialize(mimes)
@order, @responses = [], {}
@responses = {}
mimes.each { |mime| send(mime) }
end
......@@ -414,7 +414,6 @@ def any(*args, &block)
def custom(mime_type, &block)
mime_type = Mime::Type.lookup(mime_type.to_s) unless mime_type.is_a?(Mime::Type)
@order << mime_type
@responses[mime_type] ||= block
end
......@@ -423,7 +422,7 @@ def response
end
def negotiate_format(request)
@format = request.negotiate_mime(order)
@format = request.negotiate_mime(@responses.keys)
end
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册