diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-02-27 19:57:41 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-02-27 19:57:41 +0100 |
| commit | afddc0409e53731c8f21328e83921fd234b5bf54 (patch) | |
| tree | dece4dde896f888d42dd941dcd9f48b07f73d76a /actionpack/lib/action_dispatch | |
| parent | afd4a14332c49fa0e236e6904a5f7e09ce33c407 (diff) | |
| download | rails-afddc0409e53731c8f21328e83921fd234b5bf54.tar.gz rails-afddc0409e53731c8f21328e83921fd234b5bf54.tar.bz2 rails-afddc0409e53731c8f21328e83921fd234b5bf54.zip | |
`format: true` does not override existing format constraints.
Closes #9466.
Passing `format: true` used to override the constraints: { format: /json/ }
with `/.+/`. This patch only sets the format if there is no constraint present.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index dba9ccbfa5..b0842e6354 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -129,7 +129,7 @@ module ActionDispatch end if options[:format] == true - @requirements[:format] = /.+/ + @requirements[:format] ||= /.+/ elsif Regexp === options[:format] @requirements[:format] = options[:format] elsif String === options[:format] |