diff options
| author | Christos Zisopoulos <christos@me.com> | 2011-09-26 14:27:04 +0200 |
|---|---|---|
| committer | Christos Zisopoulos <christos@me.com> | 2011-09-26 14:27:04 +0200 |
| commit | 793e9da63d74a082281d41c2bc90e7bd02adcde4 (patch) | |
| tree | 15749149aae3e18fa209bd99416ce35ad4e53539 /actionpack/lib | |
| parent | a15424b92c182bcc4d2b693dc0001a44c9b0802f (diff) | |
| download | rails-793e9da63d74a082281d41c2bc90e7bd02adcde4.tar.gz rails-793e9da63d74a082281d41c2bc90e7bd02adcde4.tar.bz2 rails-793e9da63d74a082281d41c2bc90e7bd02adcde4.zip | |
Give precedence to `config.digest = false` over manifest.yml asset digests
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index fe822b338e..1e0e9bef77 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -114,7 +114,7 @@ module Sprockets end def digest_for(logical_path) - if asset_digests && (digest = asset_digests[logical_path]) + if digest_assets && asset_digests && (digest = asset_digests[logical_path]) return digest end |