diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-01 17:54:45 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-01 17:54:45 +0000 |
commit | a390b2629a7de7cb8a8a5370aa493283c4a3f066 (patch) | |
tree | 95450d80d313e13c6a235c722761ea70aca54555 /actionpack/lib/action_controller/url_encoded_pair_parser.rb | |
parent | a4ff4fd2c38175b38af928da2b5cae2b6bb19da7 (diff) | |
parent | 3be0ad60e4fcdafd4817508a21340dbf1bda6cb4 (diff) | |
download | rails-a390b2629a7de7cb8a8a5370aa493283c4a3f066.tar.gz rails-a390b2629a7de7cb8a8a5370aa493283c4a3f066.tar.bz2 rails-a390b2629a7de7cb8a8a5370aa493283c4a3f066.zip |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/url_encoded_pair_parser.rb')
-rw-r--r-- | actionpack/lib/action_controller/url_encoded_pair_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/url_encoded_pair_parser.rb b/actionpack/lib/action_controller/url_encoded_pair_parser.rb index 57594c4259..b17b8a31aa 100644 --- a/actionpack/lib/action_controller/url_encoded_pair_parser.rb +++ b/actionpack/lib/action_controller/url_encoded_pair_parser.rb @@ -46,7 +46,7 @@ module ActionController when Array value.map { |v| get_typed_value(v) } when Hash - if value.has_key?(:tempfile) && value[:filename].any? + if value.has_key?(:tempfile) && !value[:filename].blank? upload = value[:tempfile] upload.extend(UploadedFile) upload.original_path = value[:filename] |