diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-03-15 19:46:03 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-03-15 19:46:03 +0000 |
| commit | 03a62f4afedbef8bda72c8fdf9a0092273c0f2b0 (patch) | |
| tree | 2155b65750757d26e3c8c8e0655ad32cc89d6c2e /actionpack/lib/action_view/render/partials.rb | |
| parent | f53fddf3665e6582768f4ab0c82b286b39e7fb19 (diff) | |
| parent | a594a22267bfd3346e00923742c4aa7edad0cef7 (diff) | |
| download | rails-03a62f4afedbef8bda72c8fdf9a0092273c0f2b0.tar.gz rails-03a62f4afedbef8bda72c8fdf9a0092273c0f2b0.tar.bz2 rails-03a62f4afedbef8bda72c8fdf9a0092273c0f2b0.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_view/render/partials.rb')
| -rw-r--r-- | actionpack/lib/action_view/render/partials.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb index d34ab0354c..17d16556b9 100644 --- a/actionpack/lib/action_view/render/partials.rb +++ b/actionpack/lib/action_view/render/partials.rb @@ -294,7 +294,7 @@ module ActionView def find_template(path=@path) return path unless path.is_a?(String) prefix = @view.controller_path unless path.include?(?/) - @view.find(path, prefix, true) + @view.find_template(path, prefix, true) end def partial_path(object = @object) |