aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/mime_type.rb
diff options
context:
space:
mode:
authorTobias Lütke <tobias.luetke@gmail.com>2006-08-30 00:34:36 +0000
committerTobias Lütke <tobias.luetke@gmail.com>2006-08-30 00:34:36 +0000
commitff063d700d2fda2076217ab0479e8602253ab49c (patch)
treef702ff587de6e648cf6746da7d01fa959efd37ae /actionpack/lib/action_controller/mime_type.rb
parent3704088ebde5ef074d186bff0d380858a9a01055 (diff)
downloadrails-ff063d700d2fda2076217ab0479e8602253ab49c.tar.gz
rails-ff063d700d2fda2076217ab0479e8602253ab49c.tar.bz2
rails-ff063d700d2fda2076217ab0479e8602253ab49c.zip
respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority.
Custom mime types require a block and throw proper error now. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4860 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/mime_type.rb')
-rw-r--r--actionpack/lib/action_controller/mime_type.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/mime_type.rb b/actionpack/lib/action_controller/mime_type.rb
index dccc32bb91..f2b8e32546 100644
--- a/actionpack/lib/action_controller/mime_type.rb
+++ b/actionpack/lib/action_controller/mime_type.rb
@@ -34,7 +34,7 @@ module Mime
def register(string, symbol, synonyms = [])
Mime.send :const_set, symbol.to_s.upcase, Type.new(string, symbol, synonyms)
SET << Mime.send(:const_get, symbol.to_s.upcase)
- LOOKUP[string] = EXTENSION_LOOKUP[symbol.to_s] = SET.last
+ LOOKUP[string] = EXTENSION_LOOKUP[symbol.to_s] = SET.last
end
def parse(accept_header)