aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-05-02 14:29:08 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-05-02 14:29:08 -0700
commitc1c6f514f482f8880beb8bf6e7471a201ce8af30 (patch)
tree5ac7e02c203096cb78b218829e4af793aee97829 /actionpack/lib/action_dispatch
parent3d87c26845095438b6c946dc4e1029280593fb91 (diff)
downloadrails-c1c6f514f482f8880beb8bf6e7471a201ce8af30.tar.gz
rails-c1c6f514f482f8880beb8bf6e7471a201ce8af30.tar.bz2
rails-c1c6f514f482f8880beb8bf6e7471a201ce8af30.zip
passing a nil in the polymorphic array is not supported. remove nils before you call the method
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/polymorphic_routes.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index 729b1a0116..cbc4c9d65e 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -104,6 +104,10 @@ module ActionDispatch
recipient = self
if record_or_hash_or_array.kind_of?(Array)
+ if record_or_hash_or_array.any?(&:nil?)
+ raise ArgumentError, "Nil location provided. Can't build URI."
+ end
+ record_or_hash_or_array = record_or_hash_or_array.dup
if record_or_hash_or_array.first.is_a?(ActionDispatch::Routing::RoutesProxy)
recipient = record_or_hash_or_array.shift
end