Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8739

Show
Ignore:
Timestamp:
01/27/08 01:03:56 (4 months ago)
Author:
nzkoz
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_view/partials.rb

    r8646 r8739  
    108108        when String, Symbol, NilClass 
    109109          path, partial_name = partial_pieces(partial_path) 
     110          full_partial_path = File.join(path, "_#{partial_name}") 
    110111          object = extracting_object(partial_name, object_assigns) 
    111112          local_assigns = local_assigns ? local_assigns.clone : {} 
    …… 
    114115 
    115116          if logger && logger.debug? 
    116             ActionController::Base.benchmark("Rendered #{path}/_#{partial_name}", Logger::DEBUG, false) do 
    117               render("#{path}/_#{partial_name}", local_assigns) 
     117            ActionController::Base.benchmark("Rendered #{full_partial_path}", Logger::DEBUG, false) do 
     118              render(full_partial_path, local_assigns) 
    118119            end 
    119120          else 
    120             render("#{path}/_#{partial_name}", local_assigns) 
     121              render(full_partial_path, local_assigns) 
    121122          end 
    122123        when ActionView::Helpers::FormBuilder