Updating deprecated_body.rb to use :content instead of :data or :body…

… in the params hash
rails · Jan 22, 2010 · 90bbed2 · 90bbed2
1 parent 77986f6
commit 90bbed2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/actionmailer/lib/action_mailer/deprecated_body.rb b/actionmailer/lib/action_mailer/deprecated_body.rb
@@ -14,10 +14,15 @@ def initialize_defaults(method_name)
     end
 
     def attachment(params, &block)
+      if params[:data]
+        ActiveSupport::Deprecation.warn('attachment :data => "string" is deprecated. To set the body of an attachment ' <<
+                                        'please use :content instead, like attachment :content => "string"', caller[0,10])
+        params[:content] = params.delete(:data)
+      end
       if params[:body]
-        ActiveSupport::Deprecation.warn('attachment :body => "string" is deprecated. To set the body of an attachment ' <<
+        ActiveSupport::Deprecation.warn('attachment :data => "string" is deprecated. To set the body of an attachment ' <<
-                                        'please use :data instead, like attachment :data => "string"', caller[0,10])
+                                        'please use :content instead, like attachment :content => "string"', caller[0,10])
-        params[:data] = params.delete(:body)
+        params[:content] = params.delete(:body)
       end
     end