diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-21 06:02:56 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-21 06:02:56 -0700 |
| commit | f051071c00efdfe6444516104849cffd8885479b (patch) | |
| tree | 6ba48175e1ff5b72f4b70e4f1051c264afa979ca /actionpack/lib | |
| parent | 64e12ff109ad934939df317e532647c603f90520 (diff) | |
| parent | 39f9f02ab04973b213bef8c6f4c1a71043ed709d (diff) | |
| download | rails-f051071c00efdfe6444516104849cffd8885479b.tar.gz rails-f051071c00efdfe6444516104849cffd8885479b.tar.bz2 rails-f051071c00efdfe6444516104849cffd8885479b.zip | |
Merge pull request #6423 from lest/patch-2
assets: don't add extension if other given and file exists
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 4e11221842..8ac137b4b5 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -155,8 +155,13 @@ module Sprockets end def rewrite_extension(source, dir, ext) - if ext && File.extname(source) != ".#{ext}" - "#{source}.#{ext}" + source_ext = File.extname(source) + if ext && source_ext != ".#{ext}" + if !source_ext.empty? && asset_environment[source] + source + else + "#{source}.#{ext}" + end else source end |