diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-06 20:52:57 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-06 20:52:57 +0000 |
commit | ca4c7ab362d0110bfade496ca66b30bafdb7f25e (patch) | |
tree | e5a968b9dca4c2ad2f5d936c693286a548c4702f /actionpack/lib/action_controller | |
parent | 523658c1dffc6d125898caac6bf43118fbb3e27e (diff) | |
download | rails-ca4c7ab362d0110bfade496ca66b30bafdb7f25e.tar.gz rails-ca4c7ab362d0110bfade496ca66b30bafdb7f25e.tar.bz2 rails-ca4c7ab362d0110bfade496ca66b30bafdb7f25e.zip |
Support render :text => nil. Closes #6684.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8577 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 3818960979..d419a09ec5 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -850,8 +850,8 @@ module ActionController #:nodoc: response.headers["Location"] = url_for(location) end - if text = options[:text] - render_for_text(text, options[:status]) + if options.has_key?(:text) + render_for_text(options[:text], options[:status]) else if file = options[:file] |