github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed deprecation to use ActiveSupport::Deprecation

Browse Source
This commit is contained in:
Mikel Lindsaar
2009-11-24 09:33:05 +11:00
parent 906e308220
commit 2e453d930d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actionmailer/lib/action_mailer/base.rb
View File

@@ -372,8 +372,9 @@ module ActionMailer #:nodoc:
def part(params)
params = {:content_type => params} if String === params
if custom_headers = params.delete(:headers)
STDERR.puts("Passing custom headers with :headers => {} is deprecated. Please just pass in custom headers directly.")
params = params.merge(custom_headers)
ActiveSupport::Deprecation.warn('Passing custom headers with :headers => {} is deprecated. ' <<
'Please just pass in custom headers directly.', caller[0,10])
params.merge!(custom_headers)
end
part = Mail::Part.new(params)
yield part if block_given?