aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/lookup_context.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-06-15 20:36:09 +0200
committerPiotr Sarnacki <drogus@gmail.com>2012-08-28 10:51:04 +0200
commit45efb665f0dc10cd6f8e186b06765693fda6251b (patch)
tree13e861b8a54a8e0ef4dfcc33467f42fddbc6fda4 /actionpack/lib/action_view/lookup_context.rb
parentf21a528f5508430bf9281dffe938bda6c9fbd84b (diff)
downloadrails-45efb665f0dc10cd6f8e186b06765693fda6251b.tar.gz
rails-45efb665f0dc10cd6f8e186b06765693fda6251b.tar.bz2
rails-45efb665f0dc10cd6f8e186b06765693fda6251b.zip
Add ActionView::Base.default_formats
default_formats array is used by LookupContext in order to allow rendering templates when :formats option is not passed. Previously it was always set to Mime::SET, which created dependency on Action Pack. In order to remove this dependency, Mime::SET is used only if ActionController is loaded.
Diffstat (limited to 'actionpack/lib/action_view/lookup_context.rb')
-rw-r--r--actionpack/lib/action_view/lookup_context.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index f0ea92b018..af367ac28d 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -43,7 +43,7 @@ module ActionView
end
register_detail(:locale) { [I18n.locale, I18n.default_locale].uniq }
- register_detail(:formats) { Mime::SET.symbols }
+ register_detail(:formats) { ActionView::Base.default_formats || [:html, :text, :js, :css, :xml, :json] }
register_detail(:handlers){ Template::Handlers.extensions }
class DetailsKey #:nodoc: