diff options
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
-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 |