diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 4906ad9a9c..c8d6af942d 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -61,10 +61,10 @@ module Sprockets env.paths.concat assets.paths end - env.logger = Rails.logger + env.logger = ::Rails.logger if env.respond_to?(:cache) && assets.cache_store != false - env.cache = ActiveSupport::Cache.lookup_store(assets.cache_store) || Rails.cache + env.cache = ActiveSupport::Cache.lookup_store(assets.cache_store) || ::Rails.cache end if assets.compress |