diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-28 10:31:56 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-28 10:31:56 -0200 |
| commit | 9d97ef8f21ac583838230599fdbf812b27a5bc45 (patch) | |
| tree | 37b41e2dab29653e4cdab77dacf46ec5947ababd /actionpack/lib/action_controller | |
| parent | 06cc38a2b0d4778746e8a2a2e2b6aa07e1c1c075 (diff) | |
| parent | 9c33cb26f409845cde5cd5f4298a94ac8a887f1d (diff) | |
| download | rails-9d97ef8f21ac583838230599fdbf812b27a5bc45.tar.gz rails-9d97ef8f21ac583838230599fdbf812b27a5bc45.tar.bz2 rails-9d97ef8f21ac583838230599fdbf812b27a5bc45.zip | |
Merge pull request #8327 from elia/fix-send-data-disposition-with-symbols
Accept symbols as #send_data :disposition value
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/data_streaming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 62e16ea047..95c058fc86 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -141,7 +141,7 @@ module ActionController #:nodoc: raise ArgumentError, ":#{arg} option required" if options[arg].nil? end - disposition = options[:disposition] + disposition = options[:disposition].to_s disposition += %(; filename="#{options[:filename]}") if options[:filename] content_type = options[:type] |