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 09:09:38 -0700 |
commit | bebfa5c62b6795997bf0ee8830d64e665bc1245b (patch) | |
tree | ffa4b78fdfeb3aef1d28c1c5179dafd866286c66 /actionpack/lib | |
parent | 27846d89ffbd73071e8541f8b251fa4b6d279203 (diff) | |
parent | afb053b4d388137830320ed8dd49a40dc29a962c (diff) | |
download | rails-bebfa5c62b6795997bf0ee8830d64e665bc1245b.tar.gz rails-bebfa5c62b6795997bf0ee8830d64e665bc1245b.tar.bz2 rails-bebfa5c62b6795997bf0ee8830d64e665bc1245b.zip |
Merge pull request #6752 from steveklabnik/fix_5680
Respect absolute paths in compute_source_path.
Diffstat (limited to 'actionpack/lib')
-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 4ce41d51f1..81880d17ea 100644 --- a/actionpack/lib/action_view/asset_paths.rb +++ b/actionpack/lib/action_view/asset_paths.rb @@ -35,7 +35,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) |