From edb5991a14e0dfb65d2b8802d61b44fc47004921 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Thu, 18 Mar 2010 16:55:32 -0700 Subject: Make render :partial, :layout consistent between AC and AV --- actionpack/lib/abstract_controller/layouts.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'actionpack/lib/abstract_controller/layouts.rb') diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 39a389dcb9..0cf904815a 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -290,12 +290,6 @@ module AbstractController layout = options.key?(:layout) ? options.delete(:layout) : :default value = _layout_for_option(layout) options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value - - # TODO Layout for partials should be handled here, because inside the - # partial renderer it looks for the layout as a partial. - if options.key?(:partial) && options[:layout] - options[:layout] = view_context.find_layout(options[:layout]) - end end end -- cgit v1.2.3