diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-05 02:17:29 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-05 02:35:43 +0200 |
| commit | 87c57bb88f0eb1462ed31733ebcf3d9a535d8f16 (patch) | |
| tree | b1ec2f62e4629d7bf3d5fdfa5483055f5eca6989 /actionpack/lib/sprockets/helpers/rails_helper.rb | |
| parent | ee2be435b1e5c0e94a4ee93a1a310e0471a77d07 (diff) | |
| download | rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.tar.gz rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.tar.bz2 rails-87c57bb88f0eb1462ed31733ebcf3d9a535d8f16.zip | |
Fix the lame config.action_controller.present? check scattered throughout assets_path.
Conflicts:
actionpack/test/template/sprockets_helper_test.rb
Diffstat (limited to 'actionpack/lib/sprockets/helpers/rails_helper.rb')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index e1d8fccf04..f866bc626e 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -8,9 +8,6 @@ module Sprockets def asset_paths @asset_paths ||= begin - config = self.config if respond_to?(:config) - config ||= Rails.application.config - controller = self.controller if respond_to?(:controller) paths = RailsHelper::AssetPaths.new(config, controller) paths.asset_environment = asset_environment paths.asset_digests = asset_digests |