diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-01 18:21:29 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-01 18:21:29 +0000 |
| commit | f0e9fd74aed3d74e6ae8f53dbdcd1340d238cb57 (patch) | |
| tree | fada5bc40c3d45f65de57f35f87c311679743def /actionpack/lib/action_controller | |
| parent | f2a29ca43cb0de38a25bf7f68bca5c11871692ce (diff) | |
| download | rails-f0e9fd74aed3d74e6ae8f53dbdcd1340d238cb57.tar.gz rails-f0e9fd74aed3d74e6ae8f53dbdcd1340d238cb57.tar.bz2 rails-f0e9fd74aed3d74e6ae8f53dbdcd1340d238cb57.zip | |
Make render(:inline) use locals #1556 [Michael Shuerig]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1584 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 2e0d554a55..91ebc7e69d 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -471,7 +471,14 @@ module ActionController #:nodoc: render(options.merge({ :file => options[:template], :use_full_path => true })) elsif options[:inline] - render(options.merge({ :text => @template.render_template(options[:type] || :rhtml, options[:inline]) })) + render(options.merge({ + :text => + @template.render_template( + options[:type] || :rhtml, + options[:inline], + options[:locals] || {} + ) + })) elsif options[:action] render(options.merge({ :template => default_template_name(options[:action]) })) |