diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-13 20:26:39 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-13 20:26:39 +0000 |
| commit | 43b6a74fb188e41ae686c2d948e876c1f84e7bdf (patch) | |
| tree | 10cf1fedda61f2d9f4fc97812cbfd843902079e6 /actionpack/lib/action_controller | |
| parent | e646786a76fbb8091ae3c370ff3b3a82e30fa63f (diff) | |
| download | rails-43b6a74fb188e41ae686c2d948e876c1f84e7bdf.tar.gz rails-43b6a74fb188e41ae686c2d948e876c1f84e7bdf.tar.bz2 rails-43b6a74fb188e41ae686c2d948e876c1f84e7bdf.zip | |
Added :locals support for render :inline #2463 [mdabney@cavoksolutions.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2567 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index cc13bfef14..a019a4e1fc 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -590,7 +590,7 @@ module ActionController #:nodoc: render_file(template, options[:status], true) elsif inline = options[:inline] - render_template(inline, options[:status], options[:type]) + render_template(inline, options[:status], options[:type], options[:locals] || {}) elsif action_name = options[:action] render_action(action_name, options[:status], options[:layout]) @@ -637,9 +637,9 @@ module ActionController #:nodoc: render_text(@template.render_file(template_path, use_full_path), status) end - def render_template(template, status = nil, type = :rhtml) + def render_template(template, status = nil, type = :rhtml, local_assigns = {}) add_variables_to_assigns - render_text(@template.render_template(type, template), status) + render_text(@template.render_template(type, template, nil, local_assigns), status) end def render_text(text = nil, status = nil) |