From 008f1934284dfed5a474c3471f9e0476d47f3c3b Mon Sep 17 00:00:00 2001 From: mathieuravaux Date: Sun, 27 Feb 2011 01:52:08 +0100 Subject: [PATCH] Fixes ticket #6379. Improved the handling of Accept headers containing */*. --- actionpack/lib/action_view/lookup_context.rb | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb index 06c6079..73cd789 100644 --- a/actionpack/lib/action_view/lookup_context.rb +++ b/actionpack/lib/action_view/lookup_context.rb @@ -166,10 +166,13 @@ module ActionView # Overload formats= to reject ["*/*"] values. def formats=(values) - if values && values.size == 1 - value = values.first - values = nil if value == "*/*" - values << :html if value == :js + if values + values.pop if values.last == "*/*" + if values.size == 0 + values = nil + elsif values == [:js] + values << :html + end end super(values) end -- 1.7.3.4