Merge commit 'rails/master'

2 files changed, 1 insertions, 4 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index d827ccdf2b..e566132f4e 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -291,8 +291,6 @@ module ActionMailer #:nodoc:
       :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
 
-    ActiveSupport.run_load_hooks(:action_mailer, self)
-
     class << self
 
       def mailer_name
@@ -643,5 +641,6 @@ module ActionMailer #:nodoc:
       container.add_part(part)
     end
 
+    ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index db2db59cc7..9da9132fe1 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -866,7 +866,6 @@ EOF
     regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=')
     assert_match(/#{regex}/, mail.encoded)
     string = "Foo áëô îü"
-    string.force_encoding('UTF-8') if string.respond_to?(:force_encoding)
     assert_match(string, mail.subject)
   end
 
@@ -875,7 +874,6 @@ EOF
     regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=')
     assert_match(/#{regex}/, mail.encoded)
     string = "Foo áëô îü"
-    string.force_encoding('UTF-8') if string.respond_to?(:force_encoding)
     assert_match(string, mail.subject)
   end