diff options
author | José Valim <jose.valim@gmail.com> | 2012-05-17 10:19:27 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-05-17 10:19:27 -0700 |
commit | f5ebc9a232fbbee188be432ddecbbf961162ef2a (patch) | |
tree | 2a9cf8bb248c4385669825377a831e8b483e1ff3 /actionpack/lib/action_view/template/resolver.rb | |
parent | 6ada771a08196d8a5d790f8b4b2224aa8e1748b3 (diff) | |
parent | 8bea607265a2c9bb9bb2188b0a79089ca373b814 (diff) | |
download | rails-f5ebc9a232fbbee188be432ddecbbf961162ef2a.tar.gz rails-f5ebc9a232fbbee188be432ddecbbf961162ef2a.tar.bz2 rails-f5ebc9a232fbbee188be432ddecbbf961162ef2a.zip |
Merge pull request #6309 from steveklabnik/fix-2394
Created a Raw handler for templates.
Diffstat (limited to 'actionpack/lib/action_view/template/resolver.rb')
-rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index 08155af013..fa2038f78d 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -171,7 +171,9 @@ module ActionView def extract_handler_and_format(path, default_formats) pieces = File.basename(path).split(".") pieces.shift - handler = Template.handler_for_extension(pieces.pop) + extension = pieces.pop + ActiveSupport::Deprecation.warn "The file #{path} did not specify a template handler. The default is currently ERB, but will change to RAW in the future." unless extension + handler = Template.handler_for_extension(extension) format = pieces.last && Mime[pieces.last] [handler, format] end |