aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-05-17 17:19:33 -0400
committerJoshua Peek <josh@joshpeek.com>2011-05-17 17:19:33 -0400
commit59baf2fc9c5e7aaf56cf36fdd70d9ecbc7a4a336 (patch)
treec4419b6435786f8f4e603e0bbd1cc8d457912f34
parent3773aa4fbba86184a1f45feebaf72ed4f2702fe7 (diff)
downloadrails-59baf2fc9c5e7aaf56cf36fdd70d9ecbc7a4a336.tar.gz
rails-59baf2fc9c5e7aaf56cf36fdd70d9ecbc7a4a336.tar.bz2
rails-59baf2fc9c5e7aaf56cf36fdd70d9ecbc7a4a336.zip
Remove old call to sprockets context
-rw-r--r--actionpack/lib/sprockets/railtie.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 88892293b1..8cee3babe2 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -34,15 +34,7 @@ module Sprockets
app.assets = asset_environment(app)
ActiveSupport.on_load(:action_view) 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
+ app.assets.context_class.instance_eval do
include ::ActionView::Helpers::SprocketsHelper
end
end