github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-01 09:44:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use File.join to construct partial path. Closes #10932 [patrick.t.joyce]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8739 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Michael Koziarski
2008-01-27 01:03:56 +00:00
parent 6e165b8940
commit 5ac3a9bd0b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
actionpack/lib/action_view/partials.rb
View File

@@ -107,17 +107,18 @@ module ActionView
case partial_path
when String, Symbol, NilClass
path, partial_name = partial_pieces(partial_path)
full_partial_path = File.join(path, "_#{partial_name}")
object = extracting_object(partial_name, object_assigns)
local_assigns = local_assigns ? local_assigns.clone : {}
add_counter_to_local_assigns!(partial_name, local_assigns)
add_object_to_local_assigns!(partial_name, local_assigns, object)
if logger && logger.debug?
ActionController::Base.benchmark("Rendered #{path}/_#{partial_name}", Logger::DEBUG, false) do
render("#{path}/_#{partial_name}", local_assigns)
ActionController::Base.benchmark("Rendered #{full_partial_path}", Logger::DEBUG, false) do
render(full_partial_path, local_assigns)
end
else
render("#{path}/_#{partial_name}", local_assigns)
render(full_partial_path, local_assigns)
end
when ActionView::Helpers::FormBuilder
builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')