diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-23 20:53:07 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-23 20:53:07 +1100 |
| commit | cc391c30227564032398f24417bba21ab1a3d66a (patch) | |
| tree | 774ebe17b557779db12f09bd9a6ebfb7116b781e /actionmailer/lib | |
| parent | a6eed86c33fbd074a08b76a678e968f521cf37b0 (diff) | |
| download | rails-cc391c30227564032398f24417bba21ab1a3d66a.tar.gz rails-cc391c30227564032398f24417bba21ab1a3d66a.tar.bz2 rails-cc391c30227564032398f24417bba21ab1a3d66a.zip | |
Deprecating attachment :body => 'string' in favour of attachment :data => 'string'
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index bf5e15e0e5..af3ef877b2 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -386,7 +386,11 @@ module ActionMailer #:nodoc: params = { :content_type => params } if String === params params = { :content_disposition => "attachment", :content_transfer_encoding => "base64" }.merge(params) - params[:data] = params.delete(:body) if params[:body] + if params[:body] + ActiveSupport::Deprecation.warn('attachment :body => "string" is deprecated. To set the body of an attachment ' << + 'please use :data instead, like attachment :data => "string".', caller[0,10]) + params[:data] = params.delete(:body) + end part(params, &block) end |