diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-18 16:55:32 -0700 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-18 16:55:32 -0700 |
| commit | edb5991a14e0dfb65d2b8802d61b44fc47004921 (patch) | |
| tree | 1dd864dddc6fb2c46db5cb758dc2e859825985c3 /actionpack/lib/abstract_controller | |
| parent | 71c9337f45f9c5461cbc6ddf6cab764ad0f82c3b (diff) | |
| download | rails-edb5991a14e0dfb65d2b8802d61b44fc47004921.tar.gz rails-edb5991a14e0dfb65d2b8802d61b44fc47004921.tar.bz2 rails-edb5991a14e0dfb65d2b8802d61b44fc47004921.zip | |
Make render :partial, :layout consistent between AC and AV
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 6 |
1 files changed, 0 insertions, 6 deletions
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 |