diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2011-07-24 21:48:56 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2011-07-24 21:48:56 +0100 |
| commit | 0599e16dd9517acedf8bbc0dc27adb7689eddfb9 (patch) | |
| tree | ec4a99d6fe80333d789025fda807d937bb147943 /actionpack/lib | |
| parent | 4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364 (diff) | |
| download | rails-0599e16dd9517acedf8bbc0dc27adb7689eddfb9.tar.gz rails-0599e16dd9517acedf8bbc0dc27adb7689eddfb9.tar.bz2 rails-0599e16dd9517acedf8bbc0dc27adb7689eddfb9.zip | |
Use top level Rails constant
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 |