diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 18:17:08 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 18:17:08 -0700 |
commit | ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa (patch) | |
tree | 6742641152bab4be99a6c032168c7cb067dedfc1 /actionpack/lib/action_controller/new_base/layouts.rb | |
parent | 7dd072d333040d2bb1197baa55fddfb9b72053bd (diff) | |
download | rails-ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa.tar.gz rails-ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa.tar.bz2 rails-ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa.zip |
Get render :inline working
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 a8e0809ac6..79abe40389 100644 --- a/actionpack/lib/action_controller/new_base/layouts.rb +++ b/actionpack/lib/action_controller/new_base/layouts.rb @@ -13,7 +13,7 @@ module ActionController # render :text => ..., :layout => ... # or # render :anything_else - if !options.key?(:text) || options.key?(:layout) + if (!options.key?(:text) && !options.key?(:inline)) || options.key?(:layout) options[:_layout] = options.key?(:layout) ? _layout_for_option(options[:layout]) : _default_layout end |