github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Backout of blowup fix

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2006-09-03 22:46:16 +00:00
parent 268c1dee8f
commit 315603e2be
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
actionpack/lib/action_controller/base.rb
View File

@@ -671,21 +671,12 @@ module ActionController #:nodoc:
def render(options = nil, deprecated_status = nil, &block) #:doc:
raise DoubleRenderError, "Can only render or redirect once per action" if performed?
if options.nil?
return render_file(default_template_name)
else
# Backwards compatibility
unless options.is_a?(Hash)
if options == :update
options = { :update => true }
else
ActiveSupport::Deprecation.warn(
"WARNING: You called render(#{options}), which is a deprecated API. Instead you use " +
"render :file => #{options}. Calling render with just a string will be removed from Rails 2.0."
)
return render_file(options || default_template_name, deprecated_status, true)
end
# Backwards compatibility
unless options.is_a?(Hash)
if options == :update
options = {:update => true}
else
return render_file(options || default_template_name, deprecated_status, true)
end
end