TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Consistent default handling in ActionView render. Closes #6534.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5411 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2006-11-02 19:21:53 +00:00
parent 0ee5d64c34
commit 99b607d717
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_view/base.rb
View File

@ -276,8 +276,7 @@ def render(options = {}, old_local_assigns = {}, &block) #:nodoc:
elsif options == :update
update_page(&block)
elsif options.is_a?(Hash)
options[:locals] ||= {}
options[:use_full_path] = options[:use_full_path].nil? ? true : options[:use_full_path]
options = options.reverse_merge(:type => :rhtml, :locals => {}, :use_full_path => true)
if options[:file]
render_file(options[:file], options[:use_full_path], options[:locals])
@ -286,7 +285,7 @@ def render(options = {}, old_local_assigns = {}, &block) #:nodoc:
elsif options[:partial]
render_partial(options[:partial], ActionView::Base::ObjectWrapper.new(options[:object]), options[:locals])
elsif options[:inline]
render_template(options[:type] || :rhtml, options[:inline], nil, options[:locals] || {})
render_template(options[:type], options[:inline], nil, options[:locals])
end
end
end