diff options
| author | Peter Wagenet <peter.wagenet@gmail.com> | 2012-09-17 10:36:15 -0700 |
|---|---|---|
| committer | Peter Wagenet <peter.wagenet@gmail.com> | 2012-09-17 15:32:31 -0700 |
| commit | 1ac19c11792a745cd654f02dfaed8e93f95b3c70 (patch) | |
| tree | 68f8dacd5fe1cb44ba2db4561148ad8fc4eef827 /actionpack/lib/sprockets | |
| parent | 24a77743b69b2a3452848f7d78afd2692b209a03 (diff) | |
| download | rails-1ac19c11792a745cd654f02dfaed8e93f95b3c70.tar.gz rails-1ac19c11792a745cd654f02dfaed8e93f95b3c70.tar.bz2 rails-1ac19c11792a745cd654f02dfaed8e93f95b3c70.zip | |
Respect `config.digest = false` for `asset_path`
Previously, the `asset_path` internals only respected the `:digest`
option, but ignored the global config setting. This meant that
`config.digest = false` could not be used in conjunction with
`config.compile = false` this corrects the behavior.
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 8f0e0f8ee1..690c71b472 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -147,7 +147,9 @@ module Sprockets if source[0] == ?/ source else - source = digest_for(source) unless options[:digest] == false + if digest_assets && options[:digest] != false + source = digest_for(source) + end source = File.join(dir, source) source = "/#{source}" unless source =~ /^\// source |