diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-10-16 19:52:21 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-10-16 19:52:21 +0000 |
| commit | 03b383853d3e1de85cf1b345e2b0dd5cb1f42479 (patch) | |
| tree | 6f9918fd360e4884d41e57c43301e83429be2665 /actionpack/lib | |
| parent | d1ae92eeb25364d3a50c8dd00c5006f2038e0b19 (diff) | |
| download | rails-03b383853d3e1de85cf1b345e2b0dd5cb1f42479.tar.gz rails-03b383853d3e1de85cf1b345e2b0dd5cb1f42479.tar.bz2 rails-03b383853d3e1de85cf1b345e2b0dd5cb1f42479.zip | |
Fix routing to correctly determine when generation fails. Closes #6300.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5314 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 79ec617cc8..2f24bf4c34 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -1229,7 +1229,7 @@ module ActionController routes.each do |route| results = route.send(method, options, merged, expire_on) - return results if results + return results if results && (!results.is_a?(Array) || results.first) end end |