diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-06 12:11:38 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-06 12:11:38 +0100 |
| commit | c954d54e2f36bb53ced5e3655adc071dd233797e (patch) | |
| tree | d84bf4bf51f65a1c817089c6fe37c3e9f20420d0 /actionmailer/lib/action_mailer/old_api.rb | |
| parent | f2b41914d6be935182d37e0c0d491352ac3de043 (diff) | |
| parent | d40ca9cce241a8083756c993d6c99a79e62e050e (diff) | |
| download | rails-c954d54e2f36bb53ced5e3655adc071dd233797e.tar.gz rails-c954d54e2f36bb53ced5e3655adc071dd233797e.tar.bz2 rails-c954d54e2f36bb53ced5e3655adc071dd233797e.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'actionmailer/lib/action_mailer/old_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index b8c15df263..0396f0775e 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -247,8 +247,8 @@ module ActionMailer [ nil, {} ] else ctype, *attrs = @content_type.split(/;\s*/) - attrs = attrs.inject({}) { |h,s| k,v = s.split(/\=/, 2); h[k] = v; h } - [ctype, {"charset" => @charset}.merge(attrs)] + attrs = Hash[attrs.map { |attr| attr.split(/\=/, 2) }] + [ctype, {"charset" => @charset}.merge!(attrs)] end end end |