diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-12-11 10:17:29 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-12-11 10:17:29 -0600 |
| commit | 7cfa6c535bc54f16a3fc7fa39969d4410de3e483 (patch) | |
| tree | fd84d8c25c9006ae659cc1263317dca2063c3f71 /actionpack/lib/action_view/template.rb | |
| parent | 7394d12dc7c4bd6c1604e482042efab23f455794 (diff) | |
| download | rails-7cfa6c535bc54f16a3fc7fa39969d4410de3e483.tar.gz rails-7cfa6c535bc54f16a3fc7fa39969d4410de3e483.tar.bz2 rails-7cfa6c535bc54f16a3fc7fa39969d4410de3e483.zip | |
Fixed template lookups from outside the rails root [#1557 state:resolved]
Diffstat (limited to 'actionpack/lib/action_view/template.rb')
| -rw-r--r-- | actionpack/lib/action_view/template.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index e32b7688d0..93748638c3 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -105,7 +105,7 @@ module ActionView #:nodoc: def find_full_path(path, load_paths) load_paths = Array(load_paths) + [nil] load_paths.each do |load_path| - file = [load_path, path].compact.join('/') + file = load_path ? "#{load_path.to_str}/#{path}" : path return load_path, file if File.file?(file) end raise MissingTemplate.new(load_paths, path) |