diff options
| author | Sam Ruby <rubys@intertwingly.net> | 2010-02-01 19:47:31 -0500 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 12:05:49 +1100 |
| commit | 5998dd7bb84c76f4c8a272a71b588e2331989b4b (patch) | |
| tree | 34a2f3e0694dc9ee4cb083a437b24f8504311451 /actionpack/lib/action_view/template/resolver.rb | |
| parent | 485f12fe4cbf4ae9d22454a6a02c786ef10514f7 (diff) | |
| download | rails-5998dd7bb84c76f4c8a272a71b588e2331989b4b.tar.gz rails-5998dd7bb84c76f4c8a272a71b588e2331989b4b.tar.bz2 rails-5998dd7bb84c76f4c8a272a71b588e2331989b4b.zip | |
Resolve view paths correctly on CygWin
Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com>
Diffstat (limited to 'actionpack/lib/action_view/template/resolver.rb')
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index 6878067f7c..8acfe6cad0 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -104,7 +104,7 @@ module ActionView end def query(path, exts) - query = "#{@path}/#{path}" + query = File.join(@path, path) exts.each do |ext| query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << '}' end |