From 631dc618853325e5780237388224cb785a3a1b82 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 2 Jun 2010 16:49:02 -0500
Subject: Extract assets paths and make them available to Action Mailer as well
---
actionpack/lib/abstract_controller.rb | 1 +
actionpack/lib/action_controller/base.rb | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'actionpack')
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 2da4dc052c..5990a1bbd0 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -20,5 +20,6 @@ module AbstractController
autoload :Logger
autoload :Rendering
autoload :Translation
+ autoload :AssetPaths
autoload :ViewPaths
end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4297d9bbf6..73e07d59e3 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -13,6 +13,7 @@ module ActionController
MODULES = [
AbstractController::Layouts,
AbstractController::Translation,
+ AbstractController::AssetPaths,
Helpers,
HideActions,
@@ -67,7 +68,7 @@ module ActionController
end
# TODO Move this to the appropriate module
- config_accessor :assets_dir, :asset_path, :javascripts_dir, :stylesheets_dir
+ config_accessor :asset_path
ActiveSupport.run_load_hooks(:action_controller, self)
end
--
cgit v1.2.3