diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 14:04:23 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 14:04:23 +1100 |
| commit | 12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a (patch) | |
| tree | a7a7b097f59eaddc8cb209a1e83505843eab99fa /actionpack/lib/action_view | |
| parent | 535ae3b946b387af7eb6cb4bb4aed3d5cac1cf81 (diff) | |
| parent | df8852d04d030330efcb86f16977b837473bf022 (diff) | |
| download | rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.tar.gz rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.tar.bz2 rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.zip | |
Merge branch 'master' of git://github.com/rails/rails
Conflicts:
activemodel/README
activemodel/lib/active_model/errors.rb
activemodel/lib/active_model/serialization.rb
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'actionpack/lib/action_view')
| -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 |