Added that deliver_* will now return the email that was sent

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 5 insertions, 6 deletions

diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 205fdc503e..d61ef71064 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added that deliver_* will now return the email that was sent
+
 * Fixed quoting for all address headers, not just to #955 [Jamis Buck]
 
 * Added that quoting to UTF-8 only happens if the characters used are in that range #955 [Jamis Buck] 
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index b731880570..36159028b7 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -111,15 +111,11 @@ module ActionMailer #:nodoc:
         end
       end
 
-      def mail(to, subject, body, from, timestamp = nil, headers = {},
-               charset = @@default_charset
-      ) #:nodoc:
+      def mail(to, subject, body, from, timestamp = nil, headers = {}, charset = @@default_charset) #:nodoc:
         deliver(create(to, subject, body, from, timestamp, headers, charset))
       end
 
-      def create(to, subject, body, from, timestamp = nil, headers = {},
-                 charset = @@default_charset
-      ) #:nodoc:
+      def create(to, subject, body, from, timestamp = nil, headers = {}, charset = @@default_charset) #:nodoc:
         m = TMail::Mail.new
         m.body = body
         m.subject, = quote_any_if_necessary(charset, subject)
@@ -139,6 +135,7 @@ module ActionMailer #:nodoc:
       def deliver(mail) #:nodoc:
         logger.info "Sent mail:\n #{mail.encoded}" unless logger.nil?
         send("perform_delivery_#{delivery_method}", mail) if perform_deliveries
+        return mail
       end
 
       def quoted_printable(text, charset)#:nodoc: