diff options
| author | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
|---|---|---|
| committer | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
| commit | 117f09c5d1eb600908001bb7b5ee353756e56456 (patch) | |
| tree | 717d45020cf652840f90c09579692e30bf31237b /actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | |
| parent | 8caf16a281260fedb0677c85047469e99c48da94 (diff) | |
| parent | 75780373af9a3ddd4cc1bda3d4dbfe6121102b2e (diff) | |
| download | rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.gz rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.bz2 rails-117f09c5d1eb600908001bb7b5ee353756e56456.zip | |
Merge remote-tracking branch 'origin/master' into guides-template-inheritance
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/polymorphic_routes.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb index 427a5674bd..f15868d37e 100644 --- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb +++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb @@ -197,7 +197,8 @@ module ActionDispatch case record_or_hash_or_array when Array - if record_or_hash_or_array.empty? || record_or_hash_or_array.include?(nil) + record_or_hash_or_array = record_or_hash_or_array.compact + if record_or_hash_or_array.empty? raise ArgumentError, "Nil location provided. Can't build URI." end if record_or_hash_or_array.first.is_a?(ActionDispatch::Routing::RoutesProxy) |