diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-09-04 17:24:01 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-09-04 17:24:01 -0500 |
| commit | 9bc0082f299436552aabd101f5bcb6bc2fbd6a43 (patch) | |
| tree | 4dc517198f0858f04f5b9d4d2ad343caa222b1b6 /actionpack/lib/sprockets | |
| parent | e865d125431424562b5e252ed151f6bae8dd5e8f (diff) | |
| download | rails-9bc0082f299436552aabd101f5bcb6bc2fbd6a43.tar.gz rails-9bc0082f299436552aabd101f5bcb6bc2fbd6a43.tar.bz2 rails-9bc0082f299436552aabd101f5bcb6bc2fbd6a43.zip | |
AssetNotPrecompiledError should be raise when config.assets.digest = false, config.assets.compile = false and manifest file isn't present
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 2dde2e9cc9..bcb70ee95d 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -124,7 +124,7 @@ module Sprockets end if compile_assets - if asset = asset_environment[logical_path] + if digest_assets && asset = asset_environment[logical_path] return asset.digest_path end return logical_path @@ -137,7 +137,7 @@ module Sprockets if source[0] == ?/ source else - source = digest_for(source) if digest_assets + source = digest_for(source) source = File.join(dir, source) source = "/#{source}" unless source =~ /^\// source |