aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/delivery_method
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_method')
-rw-r--r--actionmailer/lib/action_mailer/delivery_method/file.rb2
-rw-r--r--actionmailer/lib/action_mailer/delivery_method/sendmail.rb2
-rw-r--r--actionmailer/lib/action_mailer/delivery_method/smtp.rb2
-rw-r--r--actionmailer/lib/action_mailer/delivery_method/test.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_method/file.rb b/actionmailer/lib/action_mailer/delivery_method/file.rb
index 8807a05221..587ae37ffa 100644
--- a/actionmailer/lib/action_mailer/delivery_method/file.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/file.rb
@@ -1,10 +1,10 @@
require 'tmpdir'
+
module ActionMailer
module DeliveryMethod
# A delivery method implementation which writes all mails to a file.
class File < Method
-
self.settings = {
:location => defined?(Rails) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
}
diff --git a/actionmailer/lib/action_mailer/delivery_method/sendmail.rb b/actionmailer/lib/action_mailer/delivery_method/sendmail.rb
index 34e03b8060..db55af79f1 100644
--- a/actionmailer/lib/action_mailer/delivery_method/sendmail.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/sendmail.rb
@@ -3,7 +3,6 @@ module ActionMailer
# A delivery method implementation which sends via sendmail.
class Sendmail < Method
-
self.settings = {
:location => '/usr/sbin/sendmail',
:arguments => '-i -t'
@@ -18,5 +17,6 @@ module ActionMailer
end
end
end
+
end
end
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
index e39f97330c..86b0ae8329 100644
--- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
@@ -1,6 +1,5 @@
module ActionMailer
module DeliveryMethod
-
# A delivery method implementation which sends via smtp.
class Smtp < Method
@@ -27,5 +26,6 @@ module ActionMailer
end
end
end
+
end
end
diff --git a/actionmailer/lib/action_mailer/delivery_method/test.rb b/actionmailer/lib/action_mailer/delivery_method/test.rb
index e63e0abbb8..6e3239d52a 100644
--- a/actionmailer/lib/action_mailer/delivery_method/test.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/test.rb
@@ -3,10 +3,10 @@ module ActionMailer
# A delivery method implementation designed for testing, which just appends each record to the :deliveries array
class Test < Method
-
def perform_delivery(mail)
ActionMailer::Base.deliveries << mail
end
end
+
end
end