diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 01:45:35 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 01:45:35 +0000 |
| commit | b1999be5a7efd67e2602c37ed898aa8433661863 (patch) | |
| tree | 03bc833276075d802d0ce0ad261baed3d7232533 /actionpack/lib/action_view | |
| parent | 88a3343ed57c01ca358da8473d15fc4d2b4a5bff (diff) | |
| download | rails-b1999be5a7efd67e2602c37ed898aa8433661863.tar.gz rails-b1999be5a7efd67e2602c37ed898aa8433661863.tar.bz2 rails-b1999be5a7efd67e2602c37ed898aa8433661863.zip | |
A hopefully more successful attempt at the Routing branch merge
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/partials.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb index f771f0a826..bbb38778b7 100644 --- a/actionpack/lib/action_view/partials.rb +++ b/actionpack/lib/action_view/partials.rb @@ -60,7 +60,7 @@ module ActionView if partial_path.include?('/') return File.dirname(partial_path), File.basename(partial_path) else - return controller.send(:controller_name), partial_path + return controller.class.controller_path, partial_path end end |