From ef5dadaf93f9cb5cffd5913cdee3b9278d9c5c65 Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Tue, 27 Apr 2010 15:23:44 -0700 Subject: Only run load hooks once a file has been fully loaded. Signed-off-by: Jeremy Kemper --- actionmailer/lib/action_mailer/base.rb | 3 +-- actionpack/lib/action_view/base.rb | 4 ++-- 2 files changed, 3 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/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index be9791505e..4ac2ee52d6 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -176,8 +176,6 @@ module ActionView #:nodoc: delegate :logger, :to => 'ActionController::Base', :allow_nil => true end - ActiveSupport.run_load_hooks(:action_view, self) - attr_accessor :base_path, :assigns, :template_extension, :lookup_context attr_internal :captures, :request, :controller, :template, :config @@ -229,5 +227,7 @@ module ActionView #:nodoc: response.body_parts << part nil end + + ActiveSupport.run_load_hooks(:action_view, self) end end -- cgit v1.2.3