aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorNathan Weizenbaum <nex342@gmail.com>2010-04-27 15:23:44 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-04-27 21:37:40 -0700
commitef5dadaf93f9cb5cffd5913cdee3b9278d9c5c65 (patch)
tree5127ea314d4d1b4ec24548fb82c71edf37653264 /actionmailer
parent7100c9d6ca1aedea7dc1cb8a6cea08ed57432f19 (diff)
downloadrails-ef5dadaf93f9cb5cffd5913cdee3b9278d9c5c65.tar.gz
rails-ef5dadaf93f9cb5cffd5913cdee3b9278d9c5c65.tar.bz2
rails-ef5dadaf93f9cb5cffd5913cdee3b9278d9c5c65.zip
Only run load hooks once a file has been fully loaded.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb3
1 files changed, 1 insertions, 2 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