diff options
Diffstat (limited to 'actionmailer/lib/action_mailer/vendor')
-rwxr-xr-x | actionmailer/lib/action_mailer/vendor/tmail/encode.rb | 1 | ||||
-rwxr-xr-x | actionmailer/lib/action_mailer/vendor/tmail/facade.rb | 3 | ||||
-rwxr-xr-x | actionmailer/lib/action_mailer/vendor/tmail/utils.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/encode.rb b/actionmailer/lib/action_mailer/vendor/tmail/encode.rb index c0909f30d2..c7bbeef4c0 100755 --- a/actionmailer/lib/action_mailer/vendor/tmail/encode.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/encode.rb @@ -253,6 +253,7 @@ module TMail # FIXME: implement line folding # def kv_pair( k, v ) + return if v.nil? v = normalize_encoding(v) if token_safe?(v) add_text k + '=' + v diff --git a/actionmailer/lib/action_mailer/vendor/tmail/facade.rb b/actionmailer/lib/action_mailer/vendor/tmail/facade.rb index 0a12a61a75..cdbd4764f1 100755 --- a/actionmailer/lib/action_mailer/vendor/tmail/facade.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/facade.rb @@ -442,7 +442,8 @@ module TMail h.disposition = str h.params.clear else - h = store('Content-Disposition', str) + store('Content-Disposition', str) + h = @header['content-disposition'] end h.params.replace params if params end diff --git a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb b/actionmailer/lib/action_mailer/vendor/tmail/utils.rb index 4f603b96b9..57df234464 100755 --- a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/utils.rb @@ -27,7 +27,7 @@ module TMail t = Time.now sprintf('%x%x_%x%x%d%x', t.to_i, t.tv_usec, - $$, Thread.current.id, @uniq, rand(255)) + $$, Thread.current.object_id, @uniq, rand(255)) end private_class_method :random_tag |