diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-12 16:21:34 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-12 16:21:34 -0700 |
| commit | 216309c16519d94a9e0aebf758029a78696ab8d6 (patch) | |
| tree | db271a9f9cb8ddf9aed72e125fe867d0e10d40e0 /actionpack/lib/action_controller/new_base/layouts.rb | |
| parent | 72ca7c591c9eace150c0ebab1633d691a1ef12cf (diff) | |
| download | rails-216309c16519d94a9e0aebf758029a78696ab8d6.tar.gz rails-216309c16519d94a9e0aebf758029a78696ab8d6.tar.bz2 rails-216309c16519d94a9e0aebf758029a78696ab8d6.zip | |
Implemented redirects and partial rendering in new base.
Diffstat (limited to 'actionpack/lib/action_controller/new_base/layouts.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/layouts.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb index e851eb5f9a..bf5b14c4e1 100644 --- a/actionpack/lib/action_controller/new_base/layouts.rb +++ b/actionpack/lib/action_controller/new_base/layouts.rb @@ -15,7 +15,7 @@ module ActionController # render :text => ..., :layout => ... # or # render :anything_else - if (!options.key?(:text) && !options.key?(:inline)) || options.key?(:layout) + if (!options.key?(:text) && !options.key?(:inline) && !options.key?(:partial)) || options.key?(:layout) options[:_layout] = options.key?(:layout) ? _layout_for_option(options[:layout]) : _default_layout end |