aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets/railtie.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/sprockets/railtie.rb')
-rw-r--r--actionpack/lib/sprockets/railtie.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 0b4b0638b2..c75b7d4de0 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -34,7 +34,15 @@ module Sprockets
app.assets = asset_environment(app)
ActiveSupport.on_load(:action_view) do
- app.assets.context.instance_eval do
+ if app.assets.respond_to?(:context_class)
+ context = app.assets.context_class
+
+ # TODO: Remove this condition when Sprockets 2.0.beta.3 is released
+ else
+ context = app.assets.context
+ end
+
+ context.instance_eval do
include ::ActionView::Helpers::SprocketsHelper
end
end