Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Backout of blowup fix

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 315603e2be38042b7dd42cb460cd8d5cc66a0b2e 1 parent 268c1de
@dhh dhh authored
Showing with 6 additions and 15 deletions.
  1. +6 −15 actionpack/lib/action_controller/base.rb
View
21 actionpack/lib/action_controller/base.rb
@@ -671,21 +671,12 @@ def session_enabled?
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
Please sign in to comment.
Something went wrong with that request. Please try again.