aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/mime_type.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/mime_type.rb')
-rw-r--r--actionpack/lib/action_controller/mime_type.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/mime_type.rb b/actionpack/lib/action_controller/mime_type.rb
index a2233477bd..7c1448029d 100644
--- a/actionpack/lib/action_controller/mime_type.rb
+++ b/actionpack/lib/action_controller/mime_type.rb
@@ -33,7 +33,8 @@ module Mime
def register(string, symbol, synonyms = [])
Mime.send :const_set, symbol.to_s.upcase, Type.new(string, symbol, synonyms)
- LOOKUP[string] = Mime.send :const_get, symbol.to_s.upcase
+ SET << Mime.send(:const_get, symbol.to_s.upcase)
+ LOOKUP[string] = EXTENSION_LOOKUP[symbol.to_s] = SET.last
end
def parse(accept_header)
@@ -126,6 +127,7 @@ module Mime
ATOM = Type.new "application/atom+xml", :atom
YAML = Type.new "application/x-yaml", :yaml, %w( text/yaml )
+ SET = [ ALL, TEXT, HTML, JS, ICS, XML, RSS, ATOM, YAML ]
LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k == "" }