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

Ticket #10932: use_file_join_to_construct_partial_path.diff

File use_file_join_to_construct_partial_path.diff, 1.4 kB (added by patrick.t.joyce, 8 months ago)
  • actionpack/lib/action_view/partials.rb

    old new  
    107107        case partial_path 
    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 : {} 
    112113          add_counter_to_local_assigns!(partial_name, local_assigns) 
    113114          add_object_to_local_assigns!(partial_name, local_assigns, object) 
    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 
    123124          builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')