diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 21:58:13 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 21:58:13 +1100 |
| commit | 6cf378aeb048e25037a11cabe6338cd893789258 (patch) | |
| tree | dd2c4ed8efb13eef354d701efd7d8d2c649ac4ff /actionmailer/lib/action_mailer/deprecated_api.rb | |
| parent | 1170e70797e06b3f062e222d912b0cc1dd6072e5 (diff) | |
| parent | b30eb39ff072ce95ccd5ce94ae08d116c23fd260 (diff) | |
| download | rails-6cf378aeb048e25037a11cabe6338cd893789258.tar.gz rails-6cf378aeb048e25037a11cabe6338cd893789258.tar.bz2 rails-6cf378aeb048e25037a11cabe6338cd893789258.zip | |
Merge branch 'master' of github.com:mikel/rails
Diffstat (limited to 'actionmailer/lib/action_mailer/deprecated_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/deprecated_api.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb index 430b0cef4a..90e2aebf53 100644 --- a/actionmailer/lib/action_mailer/deprecated_api.rb +++ b/actionmailer/lib/action_mailer/deprecated_api.rb @@ -227,7 +227,7 @@ module ActionMailer m.mime_version = mime_version unless mime_version.nil? m.date = sent_on.to_time rescue sent_on if sent_on - headers.each { |k, v| m[k] = v } + @headers.each { |k, v| m[k] = v } real_content_type, ctype_attrs = parse_content_type main_type, sub_type = split_content_type(real_content_type) |