diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/controller/new_render_test.rb | 13 |
3 files changed, 16 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 658d346056..6597a2b63a 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* render(:inline) always defaults to :layout => false. + * Make sure the benchmarking render method always returns the output of the render. * render(:text), render(:partial), and render(:nothing) always default to :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action. 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 diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb index fb23b9e02c..a51bd2a83e 100644 --- a/actionpack/test/controller/new_render_test.rb +++ b/actionpack/test/controller/new_render_test.rb @@ -90,6 +90,10 @@ class NewRenderTestController < ActionController::Base render :inline => "Hello: <%= params[:name] %>" end + def accessing_params_in_template_with_layout + render :inline => "Hello: <%= params[:name] %>", :layout => nil + end + def rescue_action(e) raise end private @@ -97,7 +101,9 @@ class NewRenderTestController < ActionController::Base case action_name when "layout_test", "rendering_without_layout", "rendering_nothing_on_layout", "render_text_hello_world", - "partial_only", "partial_only_with_layout" + "partial_only", "partial_only_with_layout", + "accessing_params_in_template", + "accessing_params_in_template_with_layout" "layouts/standard" when "builder_layout_test" "layouts/builder" @@ -237,4 +243,9 @@ class NewRenderTest < Test::Unit::TestCase get :accessing_params_in_template, :name => "David" assert_equal "Hello: David", @response.body end + + def test_accessing_params_in_template_with_layout + get :accessing_params_in_template_with_layout, :name => "David" + assert_equal "<html>Hello: David</html>", @response.body + end end |