aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-01-12 03:09:39 +0000
committerMichael Koziarski <michael@koziarski.com>2008-01-12 03:09:39 +0000
commit7501451d7f417a304a56ac65f0b203c942920732 (patch)
tree8d896488bd8e275016f9c3ae3559d76a2c9bdf61 /actionpack/lib
parentfb63fc67fb8210fede6fea1837fd6a9c69fa499f (diff)
downloadrails-7501451d7f417a304a56ac65f0b203c942920732.tar.gz
rails-7501451d7f417a304a56ac65f0b203c942920732.tar.bz2
rails-7501451d7f417a304a56ac65f0b203c942920732.zip
don't misbehave when redirecting to nil. Closes #10272 [farleyknight]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8633 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index d419a09ec5..b0f713b049 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1029,7 +1029,8 @@ module ActionController #:nodoc:
# RedirectBackError will be raised. You may specify some fallback
# behavior for this case by rescuing RedirectBackError.
def redirect_to(options = {}, response_status = {}) #:doc:
-
+ raise ActionControllerError.new("Cannot redirect to nil!") if options.nil?
+
if options.is_a?(Hash) && options[:status]
status = options.delete(:status)
elsif response_status[:status]