diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-16 09:09:38 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-16 13:10:45 -0300 |
| commit | 52d09638dfc07413956846a6319b145511a15757 (patch) | |
| tree | fad79c3f8055a8589614c700adf37e2c00918ce2 /actionpack/lib/action_view/asset_paths.rb | |
| parent | a8e22aeadcf53a30893fbfbf6d446d504bd87b67 (diff) | |
| download | rails-52d09638dfc07413956846a6319b145511a15757.tar.gz rails-52d09638dfc07413956846a6319b145511a15757.tar.bz2 rails-52d09638dfc07413956846a6319b145511a15757.zip | |
Merge pull request #6752 from steveklabnik/fix_5680
Respect absolute paths in compute_source_path.
Diffstat (limited to 'actionpack/lib/action_view/asset_paths.rb')
| -rw-r--r-- | actionpack/lib/action_view/asset_paths.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb index f6115dbb1b..c192d3704e 100644 --- a/actionpack/lib/action_view/asset_paths.rb +++ b/actionpack/lib/action_view/asset_paths.rb @@ -33,7 +33,13 @@ module ActionView # Return the filesystem path for the source def compute_source_path(source, dir, ext) source = rewrite_extension(source, dir, ext) if ext - File.join(config.assets_dir, dir, source) + + sources = [] + sources << config.assets_dir + sources << dir unless source[0] == ?/ + sources << source + + File.join(sources) end def is_uri?(path) |