diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-07-02 00:16:12 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-07-02 00:16:12 +0200 |
| commit | 173bf3506d99c0767a41d30fbe4d306201369194 (patch) | |
| tree | 0dac2a884946e9dbd2ee2b517bbc2bd2bb34a1c3 /actionpack/lib/action_dispatch | |
| parent | ad95b6fc724d7b1ee415be189bc2d5c5b25634a3 (diff) | |
| download | rails-173bf3506d99c0767a41d30fbe4d306201369194.tar.gz rails-173bf3506d99c0767a41d30fbe4d306201369194.tar.bz2 rails-173bf3506d99c0767a41d30fbe4d306201369194.zip | |
Fix conditional order broken in ea40ec56.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index a7805edaa2..10cd1e5787 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -424,9 +424,9 @@ module ActionDispatch def append_format_to(path) if @url_encoded_form - path + @path_format - else path + else + path + @path_format end end |