diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-05-30 09:12:12 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-05-30 09:12:12 +0000 |
| commit | 6ce58318f5c1446c33599e3d0d19491618c684a6 (patch) | |
| tree | 097e62102ce3f5907935c1b4354db96111a76640 /actionpack/lib | |
| parent | f8542a64b30bb6f67bcedf0c82de1291aab3c3d9 (diff) | |
| download | rails-6ce58318f5c1446c33599e3d0d19491618c684a6.tar.gz rails-6ce58318f5c1446c33599e3d0d19491618c684a6.tar.bz2 rails-6ce58318f5c1446c33599e3d0d19491618c684a6.zip | |
render(:inline) defaults to :layout => false
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1372 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index d4ec7744aa..52b02f851d 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -221,8 +221,8 @@ module ActionController #:nodoc: def render_with_a_layout_options(options) return options unless options.is_a?(Hash) case - when options[:text], options[:partial], options[:nothing] - # by default, :text, :partial, and :nothing never use a layout + when options[:text], options[:partial], options[:nothing], options[:inline] + # by default, :text, :partial, :inline, and :nothing never use a layout { :layout => false }.merge(options) else options |