diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-30 11:12:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-06-03 11:33:51 -0700 |
| commit | 2c32e94b892c873bd62d13db31ace75d59e8b576 (patch) | |
| tree | 4b9a9e9e98b6d12f86d29c5164997162c2c10fca /actionpack/lib/action_dispatch/routing | |
| parent | 6a3cbaca2e460fc490ffcb168d3bc7c4f26f3abc (diff) | |
| download | rails-2c32e94b892c873bd62d13db31ace75d59e8b576.tar.gz rails-2c32e94b892c873bd62d13db31ace75d59e8b576.tar.bz2 rails-2c32e94b892c873bd62d13db31ace75d59e8b576.zip | |
always make :via a list
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 1f910e8cb6..3754ba1735 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -213,12 +213,11 @@ module ActionDispatch end @conditions[:required_defaults] = required_defaults - via = options[:via] + via = Array(options[:via]).compact - if via == :all + if via == [:all] options.delete(:via) else - via = Array(via).compact if via.empty? msg = "You should not use the `match` method in your router without specifying an HTTP method.\n" \ "If you want to expose your action to both GET and POST, add `via: [:get, :post]` option.\n" \ |