diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-03-07 14:05:18 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-03-07 14:05:18 -0600 |
| commit | ea8488caef77cb8cf2031d344e74981ab6ea0e57 (patch) | |
| tree | d5aa0502f58ef3354c2baaed0779b19f11b4aa24 /actionpack/lib/action_controller | |
| parent | 87e8b162463f13bd50d27398f020769460a770e3 (diff) | |
| download | rails-ea8488caef77cb8cf2031d344e74981ab6ea0e57.tar.gz rails-ea8488caef77cb8cf2031d344e74981ab6ea0e57.tar.bz2 rails-ea8488caef77cb8cf2031d344e74981ab6ea0e57.zip | |
Fixed simplified render with nested models [#2042 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 9d06d052b4..0facf7066d 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -908,6 +908,9 @@ module ActionController #:nodoc: end options = extra_options + elsif !options.is_a?(Hash) + extra_options[:partial] = options + options = extra_options end layout = pick_layout(options) |