diff options
author | José Valim <jose.valim@gmail.com> | 2010-11-28 12:48:50 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-11-28 12:48:50 +0100 |
commit | 31906eecdf7bffc2203379c5d40f1bb77fb35858 (patch) | |
tree | 5fd556a91870b210197371069c79f3337c9b9a24 /actionpack/lib | |
parent | a4c360e8c7b7c2635de3c1172dafff7b7975ecc5 (diff) | |
download | rails-31906eecdf7bffc2203379c5d40f1bb77fb35858.tar.gz rails-31906eecdf7bffc2203379c5d40f1bb77fb35858.tar.bz2 rails-31906eecdf7bffc2203379c5d40f1bb77fb35858.zip |
Fix tests on 1.9.2.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index 3e3478a44e..c1503c7eeb 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -190,12 +190,15 @@ module Mime # # Usage: # - # Mime::Type.unregister("text/x-mobile", :mobile) - def unregister(string, symbol) - EXTENSION_LOOKUP.delete(symbol.to_s) - LOOKUP.delete(string) - symbol = symbol.to_s.upcase.intern - Mime.module_eval { remove_const(symbol) if const_defined?(symbol) } + # Mime::Type.unregister(:mobile) + def unregister(symbol) + symbol = symbol.to_s.upcase + mime = Mime.const_get(symbol) + Mime.instance_eval { remove_const(symbol) } + + SET.delete_if { |v| v.eql?(mime) } + LOOKUP.delete_if { |k,v| v.eql?(mime) } + EXTENSION_LOOKUP.delete_if { |k,v| v.eql?(mime) } end end |