diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2010-10-16 13:39:11 -0200 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-10-16 13:39:11 -0200 |
commit | 0d00d65ad2d0821926c795c25161b8d1a010470c (patch) | |
tree | bdcccdc0eb060ded47ec355453f50b5ca03a0497 /actionpack/lib | |
parent | b454bb0a98e3557ad974a93828c3951bce0ac81c (diff) | |
download | rails-0d00d65ad2d0821926c795c25161b8d1a010470c.tar.gz rails-0d00d65ad2d0821926c795c25161b8d1a010470c.tar.bz2 rails-0d00d65ad2d0821926c795c25161b8d1a010470c.zip |
Delegate freeze_formats to lookup_context
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_view/renderer/abstract_renderer.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb index 9be1b5f738..53412f631d 100644 --- a/actionpack/lib/action_view/renderer/abstract_renderer.rb +++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb @@ -3,7 +3,7 @@ module ActionView attr_reader :lookup_context delegate :find_template, :template_exists?, :with_fallbacks, :update_details, - :with_layout_format, :formats, :to => :lookup_context + :with_layout_format, :formats, :freeze_formats, :to => :lookup_context def initialize(view) @view = view @@ -33,4 +33,4 @@ module ActionView ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield } end end -end
\ No newline at end of file +end diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index 36beb5c8d0..6912acee31 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -56,7 +56,7 @@ module ActionView # Renders the given template. An string representing the layout can be # supplied as well. def render_template(template, layout_name = nil, locals = {}) #:nodoc: - lookup_context.freeze_formats(template.formats, true) + freeze_formats(template.formats, true) view, locals = @view, locals || {} render_with_layout(layout_name, locals) do |layout| @@ -95,4 +95,4 @@ module ActionView end end end -end
\ No newline at end of file +end |