diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-18 06:25:36 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-18 06:25:36 -0700 |
| commit | 7c5454e555c3928604c9d4b753c7a8ff73378932 (patch) | |
| tree | 68f8dacd5fe1cb44ba2db4561148ad8fc4eef827 /actionpack/lib | |
| parent | 24a77743b69b2a3452848f7d78afd2692b209a03 (diff) | |
| parent | 1ac19c11792a745cd654f02dfaed8e93f95b3c70 (diff) | |
| download | rails-7c5454e555c3928604c9d4b753c7a8ff73378932.tar.gz rails-7c5454e555c3928604c9d4b753c7a8ff73378932.tar.bz2 rails-7c5454e555c3928604c9d4b753c7a8ff73378932.zip | |
Merge pull request #7672 from wagenet/asset_path_digest_fix
Respect `config.digest = false` for `asset_path`
Diffstat (limited to 'actionpack/lib')
| -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 |