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/railtie.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/railtie.rb')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 2cf54b7777..e29612d320 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -43,10 +43,7 @@ module Sprockets ActiveSupport.on_load(:action_view) do include ::Sprockets::Helpers::RailsHelper - - app.assets.context_class.instance_eval do - include ::Sprockets::Helpers::RailsHelper - end + app.assets.context_class.send :include, ::Sprockets::Helpers::RailsHelper end end |