aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-04 15:41:13 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-04 15:41:13 -0700
commit6521cf3316ac5378d2b6019c303a003f527b7646 (patch)
tree0b5920f655af338a25295f2044f37551714a6ddc /actionpack
parenta1fa756e17a2522d69a828ce59b801709483a34f (diff)
parent9bc0082f299436552aabd101f5bcb6bc2fbd6a43 (diff)
downloadrails-6521cf3316ac5378d2b6019c303a003f527b7646.tar.gz
rails-6521cf3316ac5378d2b6019c303a003f527b7646.tar.bz2
rails-6521cf3316ac5378d2b6019c303a003f527b7646.zip
Merge pull request #2860 from guilleiguaran/fix-assets-behavior
Fix AssetNotPrecompiledError behavior
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb4
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